loom up-thread and weave?
Barry Warsaw
barry at canonical.com
Mon Mar 10 19:24:38 GMT 2008
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On Mar 10, 2008, at 12:38 PM, John Arbash Meinel wrote:
> Have you tried "bzr remerge --weave" ?
>
> Usually after a merge you can retry with a different algorithm with
> "bzr
> remerge" and you can do it for just a specific file, etc.
>
> There are a couple of cases when you can't (cherry picking, and bzr
> update,
> because they don't leave the tree knowing what was merged.) But I
> think
> up-thread would be able to.
Thanks, that's great to know!
- -Barry
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.8 (Darwin)
iEYEARECAAYFAkfVivYACgkQ2YZpQepbvXGa7QCfQo2Y09nDtvrXCIBJgbQXyrnp
7Y4An0TDqyWO1UBCq8MRrVc6iIOKFsL5
=/Wy8
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list