Patchwork D6280: tests: avoid cryptic nodeids in tests/test-rename-merge1.t

login
register
mail settings
Submitter phabricator
Date April 19, 2019, 1:08 p.m.
Message ID <82ec7935bf65b4c39c749ca1a254b7c7@localhost.localdomain>
Download mbox | patch
Permalink /patch/39765/
State Not Applicable
Headers show

Comments

phabricator - April 19, 2019, 1:08 p.m.
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




To: martinvonz, #hg-reviewers, pulkit
Cc: mercurial-devel

Patch

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