[PATCH 3 of 3 STABLE] merge: while checking unknown files also check link flag (issue5027)

[Siddharth Agarwal]

On 12/29/15 07:15, timeless wrote:
> Siddharth Agarwal wrote:
>> Patch 2-3 are a bit of an RFC -- I'm not sure what the right behavior is
>> here. For a file to symlink or symlink to file transition if the contents
>> remain the same should we overwrite or abort?
> If the contents remain the same, I think that warning might be enough.
> Certainly, if the file it's pointing to is managed in the repository
> with that value, warning should be sufficient. If it points to an
> unmanaged file, that's more serious.

Yeah, I think it's probably more complicated than just aborting on 
symlink to file transitions. Too complicated for stable anyhow. Please 
drop patches 2-3 (but keep patch 1 -- I'm pretty sure that one's fine 
for stable).