Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-histedit-obsolete.t
changeset 18437 358c23e8f1c6
parent 18398 1a00c8451640
child 18438 81e77a8820f3 
--- a/tests/test-histedit-obsolete.t	Wed Jan 16 19:11:06 2013 +0100
+++ b/tests/test-histedit-obsolete.t	Wed Jan 16 19:14:22 2013 +0100
@@ -66,13 +66,13 @@
   > pick 652413bf663e 5 f
   > EOF
   $ hg histedit 1 --commands commands.txt --verbose | grep histedit
-  saved backup bundle to $TESTTMP/base/.hg/strip-backup/34a9919932c1-backup.hg (glob)
+  saved backup bundle to $TESTTMP/base/.hg/strip-backup/96e494a2d553-backup.hg (glob)
   $ hg log --graph --hidden
-  @  8:0efacef7cb48 f
+  @  8:cacdfd884a93 f
   |
-  o  7:ae467701c500 d
+  o  7:59d9f330561f d
   |
-  o  6:d36c0562f908 c
+  o  6:b346ab9a313d c
   |
   | x  5:652413bf663e f
   | |
@@ -88,10 +88,10 @@
   
   $ hg debugobsolete
   d2ae7f538514cd87c17547b0de4cea71fe1af9fb 0 {'date': '* *', 'user': 'test'} (glob)
-  177f92b773850b59254aa5e923436f921b55483b d36c0562f908c692f5204d606d4ff3537d41f1bf 0 {'date': '* *', 'user': 'test'} (glob)
-  055a42cdd88768532f9cf79daa407fc8d138de9b ae467701c5006bf21ffcfdb555b3d6b63280b6b7 0 {'date': '* *', 'user': 'test'} (glob)
-  e860deea161a2f77de56603b340ebbb4536308ae ae467701c5006bf21ffcfdb555b3d6b63280b6b7 0 {'date': '* *', 'user': 'test'} (glob)
-  652413bf663ef2a641cab26574e46d5f5a64a55a 0efacef7cb481bf574f69075b82d044fdbe5c20f 0 {'date': '* *', 'user': 'test'} (glob)
+  177f92b773850b59254aa5e923436f921b55483b b346ab9a313db8537ecf96fca3ca3ca984ef3bd7 0 {'date': '* *', 'user': 'test'} (glob)
+  055a42cdd88768532f9cf79daa407fc8d138de9b 59d9f330561fd6c88b1a6b32f0e45034d88db784 0 {'date': '* *', 'user': 'test'} (glob)
+  e860deea161a2f77de56603b340ebbb4536308ae 59d9f330561fd6c88b1a6b32f0e45034d88db784 0 {'date': '* *', 'user': 'test'} (glob)
+  652413bf663ef2a641cab26574e46d5f5a64a55a cacdfd884a9321ec4e1de275ef3949fa953a1f83 0 {'date': '* *', 'user': 'test'} (glob)
 
 
 Ensure hidden revision does not prevent histedit
@@ -100,25 +100,25 @@
 create an hidden revision
 
   $ cat > commands.txt <<EOF
-  > pick d36c0562f908 6 c
-  > drop ae467701c500 7 d
-  > pick 0efacef7cb48 8 f
+  > pick b346ab9a313d 6 c
+  > drop 59d9f330561f 7 d
+  > pick cacdfd884a93 8 f
   > EOF
   $ hg histedit 6 --commands commands.txt
   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg log --graph
-  @  9:7c044e3e33a9 f
+  @  9:c13eb81022ca f
   |
-  o  6:d36c0562f908 c
+  o  6:b346ab9a313d c
   |
   o  0:cb9a9f314b8b a
   
 check hidden revision are ignored (6 have hidden children 7 and 8)
 
   $ cat > commands.txt <<EOF
-  > pick d36c0562f908 6 c
-  > pick 7c044e3e33a9 8 f
+  > pick b346ab9a313d 6 c
+  > pick c13eb81022ca 8 f
   > EOF
   $ hg histedit 6 --commands commands.txt
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -130,9 +130,9 @@
 (not directly related to the test file but doesn't deserve it's own test case)
 
   $ hg log -G
-  @  9:7c044e3e33a9 f
+  @  9:c13eb81022ca f
   |
-  o  6:d36c0562f908 c
+  o  6:b346ab9a313d c
   |
   o  0:cb9a9f314b8b a
   
@@ -150,6 +150,6 @@
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg phase --force --draft .
   $ hg log -r 'children(.)'
-  9:7c044e3e33a9 f (no-eol)
+  9:c13eb81022ca f (no-eol)
   $ hg histedit -r '.'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
mercurial