Comment 10 for bug 40412

Revision history for this message
GuilhemBichot (guilhem-bichot) wrote : Re: show-base for weave merge

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.