loom up-thread and weave?

[John Arbash Meinel]

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

Barry Warsaw wrote:
| Is it possible to use 'bzr up-thread' and get the merge to use weave?  I
| merged in the bottom thread from upstream and that went fine, although
| it warned about a cross-cross merge.  But when I went up-thread I got a
| number of conflicts and I wanted to see if a weave merge had better luck.
|
| Thanks,
| -Barry
|

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.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFH1WQhJdeBCYSNAAMRAvDiAJ45uqe7phythjhMOUlA3N8MbKwzlgCfRvaL
Bfl91kkKG17zwDyi55DHTKU=
=oEYQ
-----END PGP SIGNATURE-----