[MERGE] log multiple files and directories
Aaron Bentley
aaron at aaronbentley.com
Fri Feb 6 20:18:32 GMT 2009
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Ian Clatworthy wrote:
> How did you apply the patch? I *think* "bzr merge bundle-name"
> ought to do it, while "bzr patch bundle-name" won't. IIUIC,
> merging a bundle should be smart enough to realise that the
> revisions from the dependent partial-delta branch are needed too.
Merge directives request only the change that you see in the preview
diff. If your "bzr send" commandline requests a cherrypick, then "bzr
merge" will perform a cherrypick.
Merge requires access to a repository containing all the specified
revisions, so they are installed in the repository of the merge target.
This does not imply that a pending merge will be set.
Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iEYEARECAAYFAkmMmxUACgkQ0F+nu1YWqI3K6wCfZ0BTkAL/Hw3c2yvHsu/aFBGz
3qwAnRSC8WC8ACiAiBa/SSgJT+3ODTIj
=Tg8S
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list