Mercurial > hg > evolve

changeset 2413:7263463ae79a mercurial-4.1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with future 6.1.0 test pass fine except for the removal of the extra data when accessing hidden revision. The better message are 4.2+ only.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Wed, 03 May 2017 13:12:39 +0200
parents 35a548465647 (current diff) e9b28f10b51c (diff)
children 523855eb28c1 677dfbb8bdbf
files tests/test-evolve-obshistory.t tests/test-evolve.t tests/test-inhibit.t tests/test-prune.t tests/test-userguide.t
diffstat 5 files changed, 14 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-evolve-obshistory.t
+++ b/tests/test-evolve-obshistory.t
@@ -54,7 +54,7 @@
 
   $ hg update 471f378eab4c
   abort: hidden revision '471f378eab4c'!
-  (use --hidden to access hidden revisions; successor: a468dc9b3633)
+  (use --hidden to access hidden revisions)
   [255]
   $ hg update --hidden "desc(A0)"
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -101,7 +101,7 @@
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg up 0dec01379d3b
   abort: hidden revision '0dec01379d3b'!
-  (use --hidden to access hidden revisions; pruned)
+  (use --hidden to access hidden revisions)
   [255]
   $ hg up --hidden -r 'desc(B0)'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -197,7 +197,7 @@
 
   $ hg update 471597cad322
   abort: hidden revision '471597cad322'!
-  (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a)
+  (use --hidden to access hidden revisions)
   [255]
   $ hg update --hidden 'min(desc(A0))'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -359,7 +359,7 @@
 
   $ hg update de7290d8b885
   abort: hidden revision 'de7290d8b885'!
-  (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a and 2 more)
+  (use --hidden to access hidden revisions)
   [255]
   $ hg update --hidden 'min(desc(A0))'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -425,7 +425,7 @@
 
   $ hg update 471f378eab4c
   abort: hidden revision '471f378eab4c'!
-  (use --hidden to access hidden revisions; successor: eb5a0daa2192)
+  (use --hidden to access hidden revisions)
   [255]
   $ hg update --hidden 'desc(A0)'
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
@@ -435,7 +435,7 @@
   working directory parent is obsolete! (471f378eab4c)
   (use 'hg evolve' to update to its successor: eb5a0daa2192)
   abort: hidden revision '0dec01379d3b'!
-  (use --hidden to access hidden revisions; successor: eb5a0daa2192)
+  (use --hidden to access hidden revisions)
   [255]
   $ hg update --hidden 'desc(B0)'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -508,7 +508,7 @@
 
   $ hg update 471f378eab4c
   abort: hidden revision '471f378eab4c'!
-  (use --hidden to access hidden revisions; diverged)
+  (use --hidden to access hidden revisions)
   [255]
   $ hg update --hidden 'desc(A0)'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-evolve.t
+++ b/tests/test-evolve.t
@@ -722,7 +722,7 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg fold --from 6 # want to run hg fold 6
   abort: hidden revision '6'!
-  (use --hidden to access hidden revisions; successor: af636757ce3b)
+  (use --hidden to access hidden revisions)
   [255]
   $ hg log -r 11 --template '{desc}\n'
   add 3
--- a/tests/test-inhibit.t
+++ b/tests/test-inhibit.t
@@ -364,7 +364,7 @@
 
   $ hg export 1 3
   abort: hidden revision '1'!
-  (use --hidden to access hidden revisions; pruned)
+  (use --hidden to access hidden revisions)
   [255]
 
 
@@ -432,7 +432,7 @@
   
   $ hg rebase -s 10 -d 3 
   abort: hidden revision '3'!
-  (use --hidden to access hidden revisions; pruned)
+  (use --hidden to access hidden revisions)
   [255]
   $ hg rebase -r ad78ff7d621f -r 53a94305e133 -d  2db36d8066ff --config experimental.rebaseskipobsolete=0
   Warning: accessing hidden changesets 2db36d8066ff for write operation
@@ -803,7 +803,7 @@
   $ hg push -r 003a4735afde $pwd/inhibit2
   pushing to $TESTTMP/inhibit2
   abort: hidden revision '003a4735afde'!
-  (use --hidden to access hidden revisions; successor: 71eb4f100663)
+  (use --hidden to access hidden revisions)
   [255]
 
 Visible commits can still be pushed
--- a/tests/test-prune.t
+++ b/tests/test-prune.t
@@ -305,7 +305,7 @@
   1 changesets pruned
   $ hg id -ir dcbb326fdec2
   abort: hidden revision 'dcbb326fdec2'!
-  (use --hidden to access hidden revisions; pruned)
+  (use --hidden to access hidden revisions)
   [255]
   $ hg id -ir d62d843c9a01
   d62d843c9a01
@@ -339,7 +339,7 @@
   $ hg tag --remove --local c
   $ hg id -ir 6:2702dd0c91e7
   abort: hidden revision '6'!
-  (use --hidden to access hidden revisions; pruned)
+  (use --hidden to access hidden revisions)
   [255]
 
   $ hg debugobsstorestat
--- a/tests/test-userguide.t
+++ b/tests/test-userguide.t
@@ -39,7 +39,7 @@
   $ hg commit --amend -u alice -d '2 0' -m 'implement feature Y'
   $ hg shortlog -q -r fe0ecd3bd2a4
   abort: hidden revision 'fe0ecd3bd2a4'!
-  (use --hidden to access hidden revisions; successor: 934359450037)
+  (use --hidden to access hidden revisions)
   [255]
   $ hg --hidden shortlog -G
   @  3:934359450037  draft  implement feature Y