Backward merge causes random outputs in test-win32text

Matt Mackall mpm at selenic.com
Tue Jun 9 11:04:02 CDT 2009


On Tue, 2009-06-09 at 14:30 +0200, Patrick Mézard wrote:
> Mercurial Commits a écrit :
> > http://hg.intevation.org/mercurial/crew/rev/a964ab624385
> > changeset:   8742:a964ab624385
> > user:        Matt Mackall <mpm at selenic.com>
> > date:        Mon Jun 08 18:14:44 2009 -0500
> > summary:     merge: allow merging going backwards
> 
> It breaks test-win32text sometimes, both on Windows and OSX. The last
> update -C of the test behaves randomly. If I had a --debug:

> The considered revisions are the same, but it seems linefeed is
> sometimes considered for updating, sometimes not.

This turns out to be a race that's been there all along. If you disable
win32text, all bets are off for the accuracy of dirstate. hg will
usually (but not always) fail to notice that line-ending-expanded files
are actually modified.

-- 
http://selenic.com : development and support for Mercurial and Linux




More information about the Mercurial-devel mailing list