This revision was automatically updated to reflect the committed changes. Closed by commit rHGcb1329738d64: tests: handle Python 3 not quoting non-empty-directory error (authored by durin42, committed by ).
REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4546?vs=10954&id=10956 REVISION DETAIL https://phab.mercurial-scm.org/D4546 AFFECTED FILES tests/test-merge1.t tests/test-update-names.t CHANGE DETAILS diff --git a/tests/test-update-names.t b/tests/test-update-names.t --- a/tests/test-update-names.t +++ b/tests/test-update-names.t @@ -50,8 +50,8 @@ $ hg st ? name/file $ hg up 1 - abort: Unlinking directory not permitted: '$TESTTMP/r1/r2/name' (windows !) - abort: Directory not empty: '$TESTTMP/r1/r2/name' (no-windows !) + abort: Unlinking directory not permitted: '?$TESTTMP/r1/r2/name'? (re) (windows !) + abort: Directory not empty: '?\$TESTTMP/r1/r2/name'? (re) (no-windows !) [255] $ cat name/file text diff --git a/tests/test-merge1.t b/tests/test-merge1.t --- a/tests/test-merge1.t +++ b/tests/test-merge1.t @@ -30,8 +30,8 @@ $ mkdir b && touch b/nonempty $ hg up - abort: Unlinking directory not permitted: '$TESTTMP/t/b' (windows !) - abort: Directory not empty: '$TESTTMP/t/b' (no-windows !) + abort: Unlinking directory not permitted: '?\$TESTTMP/t/b'? (re) (windows !) + abort: Directory not empty: '?\$TESTTMP/t/b'? (re) (no-windows !) [255] $ hg ci abort: last update was interrupted To: durin42, #hg-reviewers, pulkit Cc: mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel