Comment 11 for bug 40412

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

GuilhemBichot wrote:
> Thanks John!! This is great progress.
> So I took an old big criss-cross merge case, followed your instructions, used plan_to_base.py to create .BASE files.
> Before checking the BASE files (a significant job :-), I wonder - there are two ways to go for this bug. Create BASE files for usage with 3-way merge tools like kdiff3, as you have done for now. Or insert a BASE text section into the merged file, near the <<<<TREE and >>>>MERGE-SOURCE blocks (like --show-base --merge3 does).
>>From experience, I was under the impression that, with --merge3, the conflicts showed as TREE/MERGE-SOURCE blocks were sometimes smarter than those showed by a 3-way merge tool (kdiff3 in my case). Like if bzr was doing a better job at finding conflicts, or doing a better job at not autosolving conflicts in a bad way. Like if the patiencediff algorithm of bzr was doing a better job than the normal diff of 3-way merge tools.
> This vague impression makes me wonder if the first way is the way to go, but I'm likely confused.
> What do you think? Thanks.
>

For starters:
lp:~jameinel/bzr/2.0-40412-show-base-weave

Does have the "drop a .BASE" file done. I just couldn't push it up last
night because lp was in readonly mode.

Regardless of whether we want to support --show-base to put the content
inline, I think this is a useful improvement, as it at least allows the
user to use a GUI 3-way tool if they so desire.

As for including --show-base to insert the content inline, I still have
to think about that. I think it is possible, but I think it will require
changing a bunch of code to now include BASE lines along with the
content lines. (I think the information is available at one layer, just
not very close to the point where we output lines to the final content.)

John
=:->

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

iEYEARECAAYFAksZLAgACgkQJdeBCYSNAAPFfgCeKnVQi+pw8LxvM9+PWAhomp+V
BE0AnR2pK0mZ7Y7rEo67+qefi2KJx+Na
=yY33
-----END PGP SIGNATURE-----