Comment 14 for bug 40412

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

GuilhemBichot wrote:
> Hello John. I looked at your branch, but couldn't make it generate the .BASE file (I tried "--weave" and "--weave -Dmerge"; "--weave --show-base" was rejected with error). What command line should I use, please?
> Regarding putting the base inline or as a BASE file to be used with a GUI 3-way file merge tool, my point was that the inline blocks put by bzr seemed superior to what 3-way file merge tools do (ldue to a difference between traditional diff and patiencediff??). Which is why I wondered if the inline base wouldn't give better conflict solving.
> But if the 3-way file merge tools do a good enough job... fine with me!
>

Well, "bzr merge --weave" should drop a .BASE file if there is a
conflict. Make sure you are running the right code base. I just tested
it again, though I made a mistake the first few times through and was
running the wrong 'bzr' :).

As for inline versus external... "it depends" is probably the best I can
say. Weave works fairly different to a 3-way tool, so the types of
conflicts it generates could be different for all sorts of reasons.

This was mostly the easiest first step towards getting a .BASE that you
could try out. (well, step 2, since the script was the 'easiest' :)

I would guess that the pseudo base that weave is generating isn't going
to be as good for a 3-way tool. I would expect it to be better than
using an empty file as the .BASE though :).

Part of the issue is that with '--weave' or '--lca' there are arguably
many bases that could be relevant for the given line. I'll certainly
continue to think about how we could put base lines in the text.

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

iEYEARECAAYFAksdYNYACgkQJdeBCYSNAAOJiACfWn/Pvcq0/D9bYZ7j/gaX6BNv
7PMAni4mSC5lfcT6IxQxHtcAepOpjOFa
=nNDP
-----END PGP SIGNATURE-----