loom up-thread and weave?
Barry Warsaw
barry at canonical.com
Mon Mar 10 16:31:36 GMT 2008
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
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
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.8 (Darwin)
iEYEARECAAYFAkfVYmoACgkQ2YZpQepbvXGTJACghdLme2rWVgc1j1FQdwua/J1z
TcoAn03HbyhClb57GCrzwT+McuIw2HUS
=/ny7
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list