[PATCH 0 of 3 V2] merge: fix collision checking problems in "_checkunknownfile()"

FUJIWARA Katsunori foozy at lares.dti.ne.jp
Wed May 15 10:44:48 CDT 2013


This series focuses on checking collision between the file on
updating/merging target context and one in working directory.

This series is separated from another series for STABLE including the
patch to fix issue29, because this series seem to have to be applied
on the revision 113681bbef9e on "default" branch, which avoids symlink
traversing in "_checkunknown()".

It is also because of V2 flag.

Main differences with V1:

  - adjust to apply on the revision 113681bbef9e

  - add the patch (#2) to remove directory recursively, if there is no
    one other thatn directory


More information about the Mercurial-devel mailing list