git and bzr

[Aaron Bentley]

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

Martin Pool wrote:
> On 28/11/2006, at 11:01am, Joseph Wakeling wrote:
> 
>> A frustration with bzr is that pulling or
>> merging patches from another branch or repo requires them to share the
>> same HEAD.


> You can do this in bazaar by cherry-picking the changes you want.  We
> warn about merging between unrelated trees because it's an unusual
> operation, but perhaps we should change that balance.

If you have totally unrelated trees, the file-ids won't match up, so
you'd need to use bzr diff | patch.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD4DBQFFa6nJ0F+nu1YWqI0RAqMCAJ4i2W4aLeR5DAiohqmSGp5z/t7aywCYkqAA
Q0E77BmFhmUm+8hhW4XuOw==
=2P5k
-----END PGP SIGNATURE-----