[MERGE] Branch format 6
aaron.bentley at utoronto.ca
Mon Feb 12 16:18:54 GMT 2007
-----BEGIN PGP SIGNED MESSAGE-----
Erik Bågfors wrote:
>> I would think the way to do it is
>> cd mainline
>> bzr pull
>> bzr merge ../mystuff
>> bzr commit -m "Merged my stuff into mainline"
>> bzr push
> I don't think this one is so good because it's possible that someone
> committed to mainline in the meantime.
The same problem exists with bound branches, it's just that the recovery
is different. If push failed, you'd uncommit, pull, commit and push.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
-----END PGP SIGNATURE-----
More information about the bazaar