2010/4/12 D. Richard Hipp <d...@hwaci.com>: > > On Apr 12, 2010, at 12:52 PM, D. Richard Hipp wrote: > >> >> On Apr 12, 2010, at 12:48 PM, Johan Samyn wrote: >>> >>> It would be interesting to have Fossil automatically use any >>> configured external 3-way merge tool when it's own 3-way merge ends >>> with conflicts, so one can manually and visually solve them, instead >>> of having to go to the sourcefiles. And I thought the gdiff-command >>> setting was meant for that ? Or is that one just for 2-way >>> (graphical) >>> diff viewing ? >> >> "setting gdiff" is for 2-way graphical diff viewing only. >> >> Your idea of only using the 3-way graphical merger when there are >> conflicts is a good one. Tnx > > Or would it be sufficient for Fossil to merely retain the three input > files to the merge using some suffix when there is a conflict: > > problem.c~BASE > problem.c~OTHER > problem.c~THIS > > Fossil would still writes its output (contain the <<<<<<< CONFLICT > marks that people don't like) but the user would be able to manually > invoke whatever graphical 3-way merging tool they want. > > Hmmm, personally I don't like those markers staying there, nor the extra files in the working tree. And if you can produce the 3 files anyway, then passing them immediately to a configured tool, and capturing the result, is not that much more work I presume. The ability to enter a config setting like :
3way-diff-tool = kdiff3 --auto --L1 base --L2 this --L3 other $base $this $other -o $output would do I suppose. And having the 3-way-diff tool launched automatically for every conflict would be a nice way of working. What do you think ? Johan _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
