> -----Original Message----- > From: [email protected] > [mailto:[email protected]] > Sent: Wednesday, April 17, 2013 3:24 PM > To: [email protected] > Subject: [thg] Reviewing merge with common ancestor - diff3args > $ancestor bug > > One significant problem I am having with TortoiseHg is an inability to > view the common ancestor of a 3-way merge when reviewing merge > results. I am able to see the common ancestor when I perform the > merge with a tool like BeyondCompare 3 (pay version), but when I try > to review the merge results afterwards, I only see the two parents and > the child, but the common ancestor is not available. This makes it very > difficult to assess the correctness of a merge. Something is displayed in > the fourth BeyondCompare panel, but I'm pretty sure that it's not the > actual common ancestor file (based on the invocation command-line > parameters). > > The TortoiseHg documentation states that there should be a $ancestor > variable available for diff3args in mercurial.ini. However, this variable > does not get substituted when using it in the diff3args command-line > for reviewing merge results in 2.7.2. Looks like a bug to me, but I > thought I'd get input from this group first. > > Thanks, > > Uli
As much as I want the functionality you describe, I don't think they consider this a thg bug. The 3-Way Diff button does exactly what it says. It shows a 3-way diff between local, merged, and other. If you use KDiff3 as the merge tool, it doesn't even show you the 4th output panel because it isn't trying to redo the merge. Beyond Compare doesn't seem to have a 3-way diff separate from its merge process so it treats the 3-way diff as a new merge and the output panel is Beyond Compare's unnamed attempt to create a new merged file using the existing merge as ancestor. Whether or not the fourth panel matches the real ancestor depends on what happened in the original merge. I've messed up merges a couple of times because of this confusion. I think what is really needed is new functionality. We need a way to view merge results seeing all 4 files, local, other, ancestor, & current merge result. The biggest problem is that this functionality is actually missing from the diff tools. You can pass Beyond Compare and KDiff3 local, other, ancestor, and merge result files but they won't show you the existing merge result, they just redo the merge. If the file was auto-merged by your diff tool then no problem, but if your current merged file had some manual changes or conflict resolutions, they are missing and you have remember to redo them. Mischa ________________________________ This e-mail message, including any attachments, is for the sole use of the intended recipient(s) and may contain information that is confidential and protected by law from unauthorized disclosure. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient, please contact the sender by reply e-mail and destroy all copies of the original message. ------------------------------------------------------------------------------ Precog is a next-generation analytics platform capable of advanced analytics on semi-structured data. The platform includes APIs for building apps and a phenomenal toolset for data science. Developers can use our toolset for easy data analysis & visualization. Get a free account! http://www2.precog.com/precogplatform/slashdotnewsletter _______________________________________________ Tortoisehg-discuss mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
