Problem with merge after a dir rename

[Long Vu]

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.


-- 
Long Vu | Build Controller | Intelerad | +1-514-931-6222 ext. 7743

-- 

This email or any attachments may contain confidential or legally 
privileged information intended for the sole use of the addressees. Any 
use, redistribution, disclosure, or reproduction of this information, 
except as intended, is prohibited. If you received this email in error, 
please notify the sender and remove all copies of the message, including 
any attachments.