pull/init from bzr merge directive

Aaron Bentley aaron at aaronbentley.com
Thu Nov 1 13:35:48 UTC 2012


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 12-10-31 05:13 PM, Brian de Alwis wrote:
> On 31-Oct-2012, at 7:23 AM, Bastian B wrote:
>> thank you for your time. It works! I was confused by the "empty"
>> repo and thought that was the one containing the revisions. The
>> workflow you described is not very intuitive (for me) but works.
>> It's kinda strange to use an empty SUBMIT_BRANCH (/tmp/empty in
>> your example). I was expecting to be able to use -r 0.. or so.
> 
> I'm not sure what the -r argument actually does.

The -r argument specifies the merge you want to perform, and has the
same meaning as it does in "bzr merge".  The initial revision, if
specified, is used as the BASE of the merge, and the final one is used
as the OTHER.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://www.enigmail.net/

iEYEARECAAYFAlCSerQACgkQ0F+nu1YWqI2QDwCfXsVpeQLHYqIVGqUIF7izCsHi
r8wAnRVrCytlvNLdAd4TPtvLWvhRMyEH
=WI+e
-----END PGP SIGNATURE-----



More information about the bazaar mailing list