Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
compat: adapt to test output changes
authorBoris Feld <boris.feld@octobus.net>
Fri, 01 Sep 2017 11:08:22 +0200
changeset 2892 0eed6678b150
parent 2891 b18d2b2f18a6
child 2893 0938f3a09a1e
compat: adapt to test output changes different access pattern in 4.4 means different results. Make evolve works with mercurial core 72b5f4d53c58
tests/test-inhibit.t file | annotate | diff | comparison | revisions 
--- a/tests/test-inhibit.t	Fri Sep 01 11:07:28 2017 +0200
+++ b/tests/test-inhibit.t	Fri Sep 01 11:08:22 2017 +0200
@@ -432,12 +432,12 @@
   o  0:54ccbc537fc2 add cA
   
   $ hg rebase -s 10 -d 3 
-  abort: hidden revision '3'!
+  abort: hidden revision '10'!
   (use --hidden to access hidden revisions; pruned)
   [255]
   $ hg rebase -r ad78ff7d621f -r 53a94305e133 -d  2db36d8066ff --config experimental.rebaseskipobsolete=0
+  Warning: accessing hidden changesets ad78ff7d621f,53a94305e133 for write operation
   Warning: accessing hidden changesets 2db36d8066ff for write operation
-  Warning: accessing hidden changesets ad78ff7d621f,53a94305e133 for write operation
   rebasing 10:ad78ff7d621f "add cK"
   rebasing 11:53a94305e133 "add cL"
   $ hg log -G
@@ -744,7 +744,7 @@
   $ hg up a438c045eb37
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg rebase -r 15:: -d 21 --config experimental.rebaseskipobsolete=True
-  note: not rebasing 15:2d66e189f5b5 "add cM", already in destination as 21:721c3c279519 "add cM"
+  note: not rebasing 15:2d66e189f5b5 "add cM", already in destination as 21:721c3c279519 "add cM" (tip)
   rebasing 16:a438c045eb37 "add cN"
   $ hg up -q 2d66e189f5b5 # To inhibit it as the rest of test depends on it
   $ hg up -q 21
evolve