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-evolve.t
changeset 742 760d01a549a6
parent 741 892a6d708c8f
child 807 4dd1cda16fd0
child 901 4f84b3307dc2 
--- a/tests/test-evolve.t	Tue Oct 15 16:20:17 2013 +0200
+++ b/tests/test-evolve.t	Wed Oct 16 00:37:29 2013 +0200
@@ -217,7 +217,6 @@
 
   $ hg amend
 
-
 This results in a new single changeset for our amended changeset, and the old
 changeset plus the updating changeset are hidden from view by default::
 
@@ -247,13 +246,13 @@
   0	: base - test
   $ hg up -q 0
   $ glog --hidden
-  o  6:23409eba69a0@default(draft) a nifty feature
+  o  6:ba0ec09b1bab@default(draft) a nifty feature
   |
-  | x  5:1c85604a32e4@default(draft) amends 568a468b60fc99a42d5d4ddbe181caff1eef308d
+  | x  5:c296b79833d1@default(draft) temporary amend commit for 568a468b60fc
   | |
-  | | o  4:f8111a076f09@default(draft) another feature
+  | | o  4:207cbc4ea7fe@default(draft) another feature
   | |/
-  | | x  3:80ebe8e4ea86@default(draft) amends 7b36850622b2fd159fa30a4fb2a1edd2043b4a14
+  | | x  3:5bb880fc0f12@default(draft) temporary amend commit for 7b36850622b2
   | | |
   | | x  2:7b36850622b2@default(draft) another feature
   | |/
@@ -262,10 +261,10 @@
   @  0:e55e0562ee93@default(public) base
   
   $ hg debugobsolete
-  7b36850622b2fd159fa30a4fb2a1edd2043b4a14 f8111a076f0975cbecb336e2bd3411be22b673fb 0 {'date': '* *', 'user': 'test'} (glob)
-  80ebe8e4ea869802d88c96622bed8ad34aff9d37 0 {'date': '* *', 'user': 'test'} (glob)
-  568a468b60fc99a42d5d4ddbe181caff1eef308d 23409eba69a0986e90cd42252852c1e6da97af5b 0 {'date': '* *', 'user': 'test'} (glob)
-  1c85604a32e4fec7b2d804c6f8cbaf4de9925ee3 0 {'date': '* *', 'user': 'test'} (glob)
+  7b36850622b2fd159fa30a4fb2a1edd2043b4a14 207cbc4ea7fee30d18b3a25f534fe5db22c6071b 0 {'date': '* *', 'user': 'test'} (glob)
+  5bb880fc0f12dd61eee6de36f62b93fdbc3684b0 0 {'date': '* *', 'user': 'test'} (glob)
+  568a468b60fc99a42d5d4ddbe181caff1eef308d ba0ec09b1babf3489b567853807f452edd46704f 0 {'date': '* *', 'user': 'test'} (glob)
+  c296b79833d1d497f33144786174bf35e04e44a3 0 {'date': '* *', 'user': 'test'} (glob)
   $ hg evolve
   move:[4] another feature
   atop:[6] a nifty feature
@@ -310,9 +309,9 @@
   recreate:[8] another feature that rox
   atop:[7] another feature
   computing new diff
-  commited as d3c9b3a5c458
+  commited as ca3b75e3e59b
   $ hg glog
-  @  9	feature-B: bumped update to 5f4744038ed5: - test
+  @  9	feature-B: bumped update to abe98aeaaa35: - test
   |
   o  7	: another feature - test
   |
evolve