Commits

Pierre-Yves David  committed 4979ef2

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.

  • Participants
  • Parent commits 9300f48
  • Branches default

Comments (0)

Files changed (1)

File tests/test-stabilize-result.t

   $ 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
   |
   $ 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
   | |
   $ 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
   | |
   |
   | 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
   | |
   $ 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
   | |