On 01/17/2011 06:20 PM, Dick Hollenbeck wrote: > A while ago I volunteered to do a write up of something similar to this: > > http://www.emacswiki.org/emacs/BzrForEmacsDevs > > for our project. Unfortunately I have yet to find that time. > > However I did discover a technique this AM which I think is an improvement > over the "merge back into testing" from a separate working-branch. > > > That is to use the command: > > $ cd working-branch > > $ bzr diff --old ../testing.checkout > /tmp/work.patch > > Then a person can apply the patch to his own testing checkout, and commit > that branch into the repo. > > The PROS: > > You have no munged log records, coming from working-branch. Only the big > picture is the testing branch log. > > The CONS: > > The patch is applied with the "patch" program, so it will not update the > testing branch with BZR file ADDs. > > > The news in all this, is that there is a > > $ bzr diff --old ../testing.checkout > > command which lets you go across branch boundaries to create a patch file. > > Dick
Well there is the $ bzr patch /tmp/work.patch command too, but it does not have the cherished --dry-run option. I wonder if it will do a bzr add behind the scenes, for fully new files. Will try that next time. Dick _______________________________________________ Mailing list: https://launchpad.net/~kicad-developers Post to : [email protected] Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
