Changes between Version 42 and Version 43 of DarcsEvaluation


Ignore:
Timestamp:
Jul 25, 2008 4:28:33 PM (7 years ago)
Author:
batterseapower
Comment:

Add bzr cherry picking pull workflow

Legend:

Unmodified
Added
Removed
Modified
  • DarcsEvaluation

    v42 v43  
    151151n <press enter>
    152152y <press enter>
     153
     154# repo2's and repo3's file now contains lines 1,3,4,5,7
     155}}}
     156
     157Bzr:
     158{{{
     159# Make a repo with a single file with lines 1,3,5,7 in
     160
     161mkdir repo1
     162cd repo1
     163bzr init
     164printf 'Line1\nLine3\nLine5\nLine7\n' > file
     165bzr add file
     166bzr commit -m patch1 --author [email protected]
     167cd ..
     168
     169# Check out 2 copies of the repo
     170
     171bzr clone repo1 repo2
     172bzr clone repo1 repo3
     173
     174# Add a patch that adds lines 2 and 6, then another that adds line 4
     175
     176cd repo1
     177printf 'Line1\nLine2\nLine3\nLine5\nLine6\nLine7\n' > file
     178bzr commit file -m patch2
     179printf 'Line1\nLine2\nLine3\nLine4\nLine5\nLine6\nLine7\n' > file
     180bzr commit file -m patch3
     181
     182# Pull the line 4 patch, but not the lines 2 and 6 patch, into the
     183# other repos non-interactively and interactively
     184
     185cd ../repo2
     186(cd ../repo1; bzr log | grep -5 patch2) # Note revision number 2
     187bzr merge -c 2 ../repo1
     188cd ../repo3
     189# We can't do this yet because bzr does not support interactive cherrypicking for merge:
     190#darcs pull
     191#n
     192#y
     193# However, these is a plugin that aims to add it, though it's not very active:
     194# https://launchpad.net/bzr-interactive
     195# That plugin does however support interactive record
    153196
    154197# repo2's and repo3's file now contains lines 1,3,4,5,7