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.
test: prepare test for core changeset 6cd9b8428104
authorPierre-Yves David <pierre-yves.david@ens-lyon.org>
Fri, 15 Nov 2013 19:14:19 -0500
changeset 748 4979ef2c0900
parent 747 9300f48786de
child 749 f728edc7fcd1
test: prepare test for core changeset 6cd9b8428104 Changeset 6cd9b8428104 in Mercurial core (2.8) make rebase preserve more extra. this mean hash changes. We make the test resilient to that.
tests/test-stabilize-result.t file | annotate | diff | comparison | revisions 
--- a/tests/test-stabilize-result.t	Fri Nov 15 18:53:29 2013 -0500
+++ b/tests/test-stabilize-result.t	Fri Nov 15 19:14:19 2013 -0500
@@ -134,7 +134,7 @@
   $ hg phase --hidden --public 8
   1 new bumped changesets
   $ glog
-  @  12:73b15c7566e9@default(draft) bk:[] newer a
+  @  12:(73b15c7566e9|d5c7ef82d003)@default\(draft\) bk:\[\] newer a (re)
   |
   o  9:7bc2f5967f5e@default(draft) bk:[] add c
   |
@@ -150,18 +150,18 @@
   $ hg evolve --any --dry-run
   recreate:[12] newer a
   atop:[8] newer a
-  hg rebase --rev 73b15c7566e9 --dest 66719795a494;
+  hg rebase --rev (73b15c7566e9|d5c7ef82d003) --dest 66719795a494; (re)
   hg update 1cf0aacfd363;
-  hg revert --all --rev 73b15c7566e9;
+  hg revert --all --rev (73b15c7566e9|d5c7ef82d003); (re)
   hg commit --msg "bumped update to %s" (no-eol)
   $ hg evolve --any
   recreate:[12] newer a
   atop:[8] newer a
   rebasing to destination parent: 66719795a494
   computing new diff
-  commited as a7cabd7bd9c2
+  commited as (a7cabd7bd9c2|671b9d7eeaec) (re)
   $ glog
-  @  14:a7cabd7bd9c2@default(draft) bk:[] bumped update to 1cf0aacfd363:
+  @  14:(a7cabd7bd9c2|671b9d7eeaec)@default\(draft\) bk:\[\] bumped update to 1cf0aacfd363: (re)
   |
   | o  9:7bc2f5967f5e@default(draft) bk:[] add c
   | |
@@ -190,7 +190,7 @@
   $ glog
   @  15:3932c176bbaa@default(draft) bk:[] More addition
   |
-  | o  14:a7cabd7bd9c2@default(draft) bk:[] bumped update to 1cf0aacfd363:
+  | o  14:(a7cabd7bd9c2|671b9d7eeaec)@default\(draft\) bk:\[\] bumped update to 1cf0aacfd363: (re)
   | |
   o |  9:7bc2f5967f5e@default(draft) bk:[] add c
   | |
@@ -216,7 +216,7 @@
   |
   | o  17:d2f173e25686@default(draft) bk:[] More addition
   |/
-  | o  14:a7cabd7bd9c2@default(draft) bk:[] bumped update to 1cf0aacfd363:
+  | o  14:(a7cabd7bd9c2|671b9d7eeaec)@default\(draft\) bk:\[\] bumped update to 1cf0aacfd363: (re)
   | |
   o |  9:7bc2f5967f5e@default(draft) bk:[] add c
   | |
@@ -253,7 +253,7 @@
   $ glog
   @  21:f344982e63c4@default(draft) bk:[] More addition
   |
-  | o  14:a7cabd7bd9c2@default(draft) bk:[] bumped update to 1cf0aacfd363:
+  | o  14:(a7cabd7bd9c2|671b9d7eeaec)@default\(draft\) bk:\[\] bumped update to 1cf0aacfd363: (re)
   | |
   o |  9:7bc2f5967f5e@default(draft) bk:[] add c
   | |
evolve