This revision was automatically updated to reflect the committed changes. Closed by commit rHG99ab7bc944d2: scmutil: don't try to delete origbackup symlinks to directories (issue5731) (authored by mbthomas, committed by ).
REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1311?vs=3265&id=3370 REVISION DETAIL https://phab.mercurial-scm.org/D1311 AFFECTED FILES mercurial/scmutil.py tests/test-origbackup-conflict.t CHANGE DETAILS diff --git a/tests/test-origbackup-conflict.t b/tests/test-origbackup-conflict.t --- a/tests/test-origbackup-conflict.t +++ b/tests/test-origbackup-conflict.t @@ -110,18 +110,12 @@ creating directory: $TESTTMP/repo/.hg/origbackups/b (glob) removing conflicting file: $TESTTMP/repo/.hg/origbackups/b (glob) getting d - removing conflicting directory: $TESTTMP/repo/.hg/origbackups/d (glob) - abort: None - [255] - -Workaround issue by deleting d: - - $ rm d - $ hg up c1 2 files updated, 0 files merged, 0 files removed, 0 files unresolved (activating bookmark c1) $ cat .hg/origbackups/b/c c4 + $ cat .hg/origbackups/d + d3 $ ls ../sym-link-target Incorrectly configure origbackuppath to be under a file diff --git a/mercurial/scmutil.py b/mercurial/scmutil.py --- a/mercurial/scmutil.py +++ b/mercurial/scmutil.py @@ -610,7 +610,7 @@ origvfs.makedirs(origbackupdir) - if origvfs.isdir(filepathfromroot): + if origvfs.isdir(filepathfromroot) and not origvfs.islink(filepathfromroot): ui.note(_('removing conflicting directory: %s\n') % origvfs.join(filepathfromroot)) origvfs.rmtree(filepathfromroot, forcibly=True) To: mbthomas, #hg-reviewers, yuja Cc: yuja, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel