D6280: tests: avoid cryptic nodeids in tests/test-rename-merge1.t
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Fri Apr 19 09:08:08 EDT 2019
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGfad480dad04d: tests: avoid cryptic nodeids in tests/test-rename-merge1.t (authored by martinvonz, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6280?vs=14857&id=14864
REVISION DETAIL
https://phab.mercurial-scm.org/D6280
AFFECTED FILES
tests/test-rename-merge1.t
CHANGE DETAILS
diff --git a/tests/test-rename-merge1.t b/tests/test-rename-merge1.t
--- a/tests/test-rename-merge1.t
+++ b/tests/test-rename-merge1.t
@@ -75,7 +75,7 @@
$ hg cp b b3
$ hg cp b b4
$ hg ci -A -m 'copy b twice'
- $ hg up eb92d88a9712
+ $ hg up '.^'
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ hg up
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -87,7 +87,7 @@
$ hg cp b b3
$ hg mv b b4
$ hg ci -A -m 'divergent renames in same changeset'
- $ hg up c761c6948de0
+ $ hg up '.^'
1 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ hg up
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
To: martinvonz, #hg-reviewers, pulkit
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list