[MERGE] log multiple files and directories
John Arbash Meinel
john at arbash-meinel.com
Fri Feb 6 15:33:18 GMT 2009
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
...
>> bzr branch bzr.dev-copy new_branch
>> cd new_branch
>> bzr pull --overwrite ../this-patch
>> cd ../bzr.dev-copy
>> bzr merge ../this-patch
>>
>>
> That is pretty much what I ended up doing, but I would expect patches
> submitted to the list to be able to be cleanly applied to bzr.dev, and
> not requiring such gymnastics. OTOH, I haven't been paying attention to
> the list for quite a while - perhaps things have changed.
I would assume that Ian was intentionally stacking his changes. And thus
showing you the changes from bzr.dev to patch1, and then another set of
changes from patch1 to patch2.
For *review* purposes, it can be a lot easier to parse patch1 and patch2
separately, rather than trying to review both at the same time.
Notice that you *could* merge into bzr.dev, even if it was just a
cherrypick, so all the revisions were in the bundle (which is what we
require).
John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iEYEARECAAYFAkmMWD4ACgkQJdeBCYSNAAPviQCgy6vPh+UXosABIedRGffKSB//
W/UAn16bcIryTMAL43O/uMANVvdsyFWM
=P8K7
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list