strange problem after merging

[Thomas Arendsen Hein]

* Matt Mackall <mpm at selenic.com> [20050722 02:31]:
> On Fri, Jul 22, 2005 at 07:28:45AM +0800, Soh Tk-r28629 wrote:
> > > Yes! It is not the same as one of its parents. It's impossible to
> > > revert file1 back to an unchanged state relative to its parents
> > > because ITS PARENTS ARE DIFFERENT. No matter how you change the file,
> > > there will be outstanding changes that will need committing. And this
> > > happens every single time you do a three-way file merge, by
> > > definition.
> > 
> > Here's what I noticed. After 'hg co -m rev-bar', 'hg parents'
> > reported rev-bar as the parent.
> 
> Ahh. This is completely different and potentially a real problem. I
> haven't had a chance to run TAH's test, but will get to it shortly.

For people browsing through old threads like I just did:
The problem is fixed in Mercurial 0.6c and above.

Thomas

-- 
Email: thomas at intevation.de
http://intevation.de/~thomas/