Problem with merge after a dir rename

Matt Mackall mpm at selenic.com
Thu Jan 14 18:24:16 UTC 2016


On Thu, 2016-01-14 at 13:18 -0500, Long Vu wrote:
> On Thu, Jan 14, 2016 at 1:01 PM, Matt Mackall <mpm at selenic.com> wrote:
> > On Thu, 2016-01-14 at 12:25 -0500, Long Vu wrote:
> > > 
> > > However, the added files show up as modified instead of added in hg
> > > status, but then correctly show up as added after commit is done.  I
> > > think I've seen this behaviour before.  Is this also a known issue?
> > 
> > That is expected. They're not added relative to p2. Diff (1974) and status
> > (2005) have very different views of the world.
> > 
> 
> So this is probably hard to fix but we should keep in mind that for
> some users, this could confuse them or even lead them to introduce
> error if they try to "fix" this while being in the merge state.

I have resolved that for the next version control tool I write, I will make sure
that diff and status studiously agree, even for merges. But for the current tool
it's definitely too late to fix.

-- 
Mathematics is the supreme nostalgia of our time.




More information about the Mercurial mailing list