2 Commits

Author	SHA1	Message	Date
Kostia Balytskyi	989ebc4f0d	update: fix bug when update tries to modify folder symlink ... In cbefa73a359814e6784a63f90b78c7afd39bc7d5, I introduced a new bug: when a symlink points to a folder in commit A and to another folder in commit B, while updating from A to B, Mercurial will try to use removedir on this symlink, which will fail. This is a very bad bug, since it basically renders symlinks to folders unusable in repos. Added test case fails without a fix and passes with it.	2016-07-21 15:55:47 -07:00
Kostia Balytskyi	78766f7ff1	update: teach hg to override untracked dir with a tracked file on update ... This is a fix to an old problem when Mercurial got confused by an untracked folder with the same name as one of the files in a commit hg was trying to update to. It is pretty safe to remove this folder if it is empty. Backing up an empty folder seems to go against Mercurial's "don't track dirs" philosophy.	2016-07-01 17:42:55 +02:00