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

timeless timeless at gmail.com
Tue Dec 29 09:15:04 CST 2015


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.


More information about the Mercurial-devel mailing list