D1311: scmutil: don't try to delete origbackup symlinks to directories (issue5731)

2017-11-09 Thread mbthomas (Mark Thomas)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG99ab7bc944d2: scmutil: dont try to delete origbackup symlinks to directories (issue5731) (authored by mbthomas, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1311: scmutil: don't try to delete origbackup symlinks to directories (issue5731)

2017-11-03 Thread mbthomas (Mark Thomas)
mbthomas updated this revision to Diff 3265. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1311?vs=3263=3265 REVISION DETAIL https://phab.mercurial-scm.org/D1311 AFFECTED FILES mercurial/scmutil.py tests/test-origbackup-conflict.t CHANGE DETAILS

D1311: scmutil: don't try to delete origbackup symlinks to directories (issue5731)

2017-11-03 Thread mbthomas (Mark Thomas)
mbthomas created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY When origbackuppath is set, when looking to see if a file we are backing up conflicts with a directory in the origbackuppath, we incorrectly match on symlinks