[MERGE] corrected some typos in the users-guide
Aaron Bentley
aaron at aaronbentley.com
Fri Jul 11 13:09:06 BST 2008
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
James Westby wrote:
> On Wed, 2008-07-09 at 21:26 +0200, Viktor Nagy wrote:
> Thanks for working on this. Unfortunately I can't review your
> work as you managed to generate an empty merge directive. Could
> you tell us how you generated it so that we can work out what
> went wrong? Did you commit your changes before "bzr send"? One
> thing to note is that in general you don't want to use "-r"
> arguments to "bzr send", if you did this then that may well
> be the cause.
No, this is not accurate. Use -r freely. Use it to ensure that the
diff shown by the merge directive should always reflect the change you
want to apply.
The /submit_branch/ controls the contents of the bundle. Specifically,
send ensures that the bundle contains all the revisions that aren't
present in the submit_branch. (i.e. anything that's not an ancestor of
the submit_branch's tip).
Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFId01i0F+nu1YWqI0RAl8qAJ9ZFDpXy3wsPZSeECp4QSRUJURa6QCcDvov
Q4rUsrDXFtRRhyoNx0Se93U=
=ufqj
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list