hg merge issues?

Matt Mackall mpm at selenic.com
Fri Jan 30 14:14:31 CST 2015


On Fri, 2015-01-30 at 19:31 +0000, doc wrote:
> Hopefully, this is the correct group.
> I have developers who are complaining that doing an "hg merge" is leaving out chucks of code and conflicts are not being displayed properly. 
> Currently, I'm using hg 2.2.2.  I have no direct knowledge of these issues, nor have I experienced them  Was there ever a hg merge issues in releases less than 2.2.2?  

That's not a terribly actionable bug report. First, 2.2.2 is ancient
history:

changeset:   16827:85a358df5bbb
branch:      stable
tag:         2.2.2
parent:      16814:9da5a2864f3f
parent:      16826:4cf41c333e74
user:        Matt Mackall <mpm at selenic.com>
date:        Fri Jun 01 15:14:13 2012 -0500
summary:     merge with i18n

Second, it's largely content-free. That said, your report doesn't sound
familiar.

The most confusing merge results historically happen when you merge in
both directions between two branches. This can create ambiguity about
how to resolve the merge for the classic three-way merge algorithm. We
address this in newer Mercurial with bid merge:

http://mercurial.selenic.com/wiki/BidMerge

-- 
Mathematics is the supreme nostalgia of our time.




More information about the Mercurial-devel mailing list