Mercurial Mercurial > pub > hg > evolve / 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-stabilize-conflict.t
branchstable
changeset 758 6b10897dcba7
parent 742 760d01a549a6
child 895 17ac69db9329 
--- a/tests/test-stabilize-conflict.t	Sat Aug 10 17:30:44 2013 -0400
+++ b/tests/test-stabilize-conflict.t	Thu Dec 26 17:21:01 2013 -0800
@@ -82,13 +82,13 @@
   merging babar
   $ hg resolve -l
   $ hg log -G
-  @  changeset:   5:800217d738cd
+  @  changeset:   5:71c18f70c34f
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     babar count up to fifteen
   |
-  o  changeset:   4:6bd654225435
+  o  changeset:   4:5977072d13c5
   |  parent:      0:29ec1554cfaf
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
@@ -109,7 +109,7 @@
   [4] babar count up to ten
   $ safesed 's/dix/ten/' babar
   $ hg diff
-  diff -r 6bd654225435 babar
+  diff -r 5977072d13c5 babar
   --- a/babar	Thu Jan 01 00:00:00 1970 +0000
   +++ b/babar	* (glob)
   @@ -7,4 +7,4 @@
@@ -133,19 +133,19 @@
   $ hg resolve -l
   U babar
   $ hg log -G
-  @  changeset:   7:3e191dd96e18
+  @  changeset:   7:e04690b09bc6
   |  tag:         tip
   |  parent:      0:29ec1554cfaf
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     babar count up to ten
   |
-  | @  changeset:   5:800217d738cd
+  | @  changeset:   5:71c18f70c34f
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     babar count up to fifteen
   | |
-  | x  changeset:   4:6bd654225435
+  | x  changeset:   4:5977072d13c5
   |/   parent:      0:29ec1554cfaf
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
@@ -166,13 +166,13 @@
   grafting revision 5
   $ hg resolve -l
   $ hg log -G
-  @  changeset:   8:92429cce7036
+  @  changeset:   8:1836b91c6c1d
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     babar count up to fifteen
   |
-  o  changeset:   7:3e191dd96e18
+  o  changeset:   7:e04690b09bc6
   |  parent:      0:29ec1554cfaf
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
@@ -193,7 +193,7 @@
   [7] babar count up to ten
   $ safesed 's/ten/zehn/' babar
   $ hg diff
-  diff -r 3e191dd96e18 babar
+  diff -r e04690b09bc6 babar
   --- a/babar	Thu Jan 01 00:00:00 1970 +0000
   +++ b/babar	* (glob)
   @@ -7,4 +7,4 @@
@@ -220,19 +220,19 @@
   $ hg resolve -l
   U babar
   $ hg log -G
-  @  changeset:   10:a7fe09efd4a1
+  @  changeset:   10:b20d08eea373
   |  tag:         tip
   |  parent:      0:29ec1554cfaf
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     babar count up to ten
   |
-  | @  changeset:   8:92429cce7036
+  | @  changeset:   8:1836b91c6c1d
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     babar count up to fifteen
   | |
-  | x  changeset:   7:3e191dd96e18
+  | x  changeset:   7:e04690b09bc6
   |/   parent:      0:29ec1554cfaf
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
evolve