diff tests/test-stabilize-result.t @ 742:760d01a549a6

amend: use core mechanism for amend

Evolve used its own code for amending. This was introduced before mercurial
includes commit --amend. The evolve code is now older and buggier. So we just
use the core cod when amend is called.

Message of the temporary commit is different, all test hash changed \o/.

Test change are been carefully checked.

--- a/tests/test-stabilize-result.t	Tue Oct 15 16:20:17 2013 +0200
+++ b/tests/test-stabilize-result.t	Wed Oct 16 00:37:29 2013 +0200
@@ -31,12 +31,12 @@
   $ hg evolve -v
   move:[2] changea
   atop:[4] changea
-  hg rebase -r cce2c55b8965 -d 1447e1c4828d
+  hg rebase -r cce2c55b8965 -d fb9d051ec0a4
   resolving manifests
   $ glog --hidden
-  @  4:1447e1c4828d@default(draft) bk:[changea] changea
+  @  4:fb9d051ec0a4@default(draft) bk:[changea] changea
   |
-  | x  3:41ad4fe8c795@default(draft) bk:[] amends 102a90ea7b4a3361e4082ed620918c261189a36a
+  | x  3:c5727dbded3c@default(draft) bk:[] temporary amend commit for 102a90ea7b4a
   | |
   | | x  2:cce2c55b8965@default(draft) bk:[] changea
   | |/
@@ -45,8 +45,8 @@
   o  0:07f494440405@default(draft) bk:[] adda
   
   $ hg debugobsolete
-  102a90ea7b4a3361e4082ed620918c261189a36a 1447e1c4828d2347df8f858aa041305fa4cf7db1 0 {'date': '* *', 'user': 'test'} (glob)
-  41ad4fe8c79565a06c89f032ef0937b3cbd68a04 0 {'date': '* *', 'user': 'test'} (glob)
+  102a90ea7b4a3361e4082ed620918c261189a36a fb9d051ec0a450a4aa2ffc8c324979832ef88065 0 {'date': '* *', 'user': 'test'} (glob)
+  c5727dbded3c3a6877cf60d6bb552a76812cb844 0 {'date': '* *', 'user': 'test'} (glob)
   cce2c55b896511e0b6e04173c9450ba822ebc740 0 {'date': '* *', 'user': 'test'} (glob)
 
 Test evolve with conflict
@@ -81,7 +81,7 @@
   [255]
   $ hg revert -r 'unstable()' a
   $ hg diff
-  diff -r e8cc1b534401 a
+  diff -r 66719795a494 a
   --- a/a	* (glob)
   +++ b/a	* (glob)
   @@ -1,1 +1,3 @@
@@ -102,9 +102,9 @@
 (the same parent case is handled in test-evolve.t)
 
   $ glog
-  @  8:e3183e9c0961@default(draft) bk:[] newer a
+  @  8:1cf0aacfd363@default(draft) bk:[] newer a
   |
-  o  7:e8cc1b534401@default(draft) bk:[changea] changea
+  o  7:66719795a494@default(draft) bk:[changea] changea
   |
   o  0:07f494440405@default(draft) bk:[] adda
   
@@ -132,13 +132,13 @@
   $ hg phase --hidden --public 8
   1 new bumped changesets
   $ glog
-  @  12:15c83af6f3a3@default(draft) bk:[] newer a
+  @  12:73b15c7566e9@default(draft) bk:[] newer a
   |
-  o  9:355c5cda4de1@default(draft) bk:[] add c
+  o  9:7bc2f5967f5e@default(draft) bk:[] add c
   |
-  | o  8:e3183e9c0961@default(public) bk:[] newer a
+  | o  8:1cf0aacfd363@default(public) bk:[] newer a
   |/
-  o  7:e8cc1b534401@default(public) bk:[changea] changea
+  o  7:66719795a494@default(public) bk:[changea] changea
   |
   o  0:07f494440405@default(public) bk:[] adda
   
@@ -148,24 +148,24 @@
   $ hg evolve --any --dry-run
   recreate:[12] newer a
   atop:[8] newer a
-  hg rebase --rev 15c83af6f3a3 --dest e8cc1b534401;
-  hg update e3183e9c0961;
-  hg revert --all --rev 15c83af6f3a3;
+  hg rebase --rev 73b15c7566e9 --dest 66719795a494;
+  hg update 1cf0aacfd363;
+  hg revert --all --rev 73b15c7566e9;
   hg commit --msg "bumped update to %s" (no-eol)
   $ hg evolve --any
   recreate:[12] newer a
   atop:[8] newer a
-  rebasing to destination parent: e8cc1b534401
+  rebasing to destination parent: 66719795a494
   computing new diff
-  commited as 503ef784bae6
+  commited as a7cabd7bd9c2
   $ glog
-  @  14:503ef784bae6@default(draft) bk:[] bumped update to e3183e9c0961:
+  @  14:a7cabd7bd9c2@default(draft) bk:[] bumped update to 1cf0aacfd363:
   |
-  | o  9:355c5cda4de1@default(draft) bk:[] add c
+  | o  9:7bc2f5967f5e@default(draft) bk:[] add c
   | |
-  o |  8:e3183e9c0961@default(public) bk:[] newer a
+  o |  8:1cf0aacfd363@default(public) bk:[] newer a
   |/
-  o  7:e8cc1b534401@default(public) bk:[changea] changea
+  o  7:66719795a494@default(public) bk:[changea] changea
   |
   o  0:07f494440405@default(public) bk:[] adda
   
@@ -186,15 +186,15 @@
   > EOF
   $ hg ci -m 'More addition'
   $ glog
-  @  15:7391601a4bfa@default(draft) bk:[] More addition
+  @  15:3932c176bbaa@default(draft) bk:[] More addition
   |
-  | o  14:503ef784bae6@default(draft) bk:[] bumped update to e3183e9c0961:
+  | o  14:a7cabd7bd9c2@default(draft) bk:[] bumped update to 1cf0aacfd363:
   | |
-  o |  9:355c5cda4de1@default(draft) bk:[] add c
+  o |  9:7bc2f5967f5e@default(draft) bk:[] add c
   | |
-  | o  8:e3183e9c0961@default(public) bk:[] newer a
+  | o  8:1cf0aacfd363@default(public) bk:[] newer a
   |/
-  o  7:e8cc1b534401@default(public) bk:[changea] changea
+  o  7:66719795a494@default(public) bk:[changea] changea
   |
   o  0:07f494440405@default(public) bk:[] adda
   
@@ -210,17 +210,17 @@
   $ hg amend
   2 new divergent changesets
   $ glog
-  @  19:3883461cc228@default(draft) bk:[] More addition
+  @  19:eacc9c8240fe@default(draft) bk:[] More addition
   |
-  | o  17:4754d61bc2db@default(draft) bk:[] More addition
+  | o  17:d2f173e25686@default(draft) bk:[] More addition
   |/
-  | o  14:503ef784bae6@default(draft) bk:[] bumped update to e3183e9c0961:
+  | o  14:a7cabd7bd9c2@default(draft) bk:[] bumped update to 1cf0aacfd363:
   | |
-  o |  9:355c5cda4de1@default(draft) bk:[] add c
+  o |  9:7bc2f5967f5e@default(draft) bk:[] add c
   | |
-  | o  8:e3183e9c0961@default(public) bk:[] newer a
+  | o  8:1cf0aacfd363@default(public) bk:[] newer a
   |/
-  o  7:e8cc1b534401@default(public) bk:[changea] changea
+  o  7:66719795a494@default(public) bk:[changea] changea
   |
   o  0:07f494440405@default(public) bk:[] adda
   
@@ -228,12 +228,12 @@
 Stabilize It
 
   $ hg evolve -qn --traceback
-  hg update -c 3883461cc228 &&
-  hg merge 4754d61bc2db &&
-  hg commit -m "auto merge resolving conflict between 3883461cc228 and 4754d61bc2db"&&
-  hg up -C 7391601a4bfa &&
+  hg update -c eacc9c8240fe &&
+  hg merge d2f173e25686 &&
+  hg commit -m "auto merge resolving conflict between eacc9c8240fe and d2f173e25686"&&
+  hg up -C 3932c176bbaa &&
   hg revert --all --rev tip &&
-  hg commit -m "`hg log -r 3883461cc228 --template={desc}`";
+  hg commit -m "`hg log -r eacc9c8240fe --template={desc}`";
   $ hg evolve -v
   merge:[19] More addition
   with: [17] More addition
@@ -242,25 +242,27 @@
   resolving manifests
   merging a
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
+  amending changeset eacc9c8240fe
   a
+  copying changeset 283ccd10e2b8 to 7bc2f5967f5e
   a
+  committed changeset 21:f344982e63c4
   $ hg st
-  $ hg amend -d '0 0' -m 'More addition' # kill date variation XXX should be done in evolve
   $ glog
-  @  22:ac6d600735a4@default(draft) bk:[] More addition
+  @  21:f344982e63c4@default(draft) bk:[] More addition
   |
-  | o  14:503ef784bae6@default(draft) bk:[] bumped update to e3183e9c0961:
+  | o  14:a7cabd7bd9c2@default(draft) bk:[] bumped update to 1cf0aacfd363:
   | |
-  o |  9:355c5cda4de1@default(draft) bk:[] add c
+  o |  9:7bc2f5967f5e@default(draft) bk:[] add c
   | |
-  | o  8:e3183e9c0961@default(public) bk:[] newer a
+  | o  8:1cf0aacfd363@default(public) bk:[] newer a
   |/
-  o  7:e8cc1b534401@default(public) bk:[changea] changea
+  o  7:66719795a494@default(public) bk:[changea] changea
   |
   o  0:07f494440405@default(public) bk:[] adda
   
   $ hg summary
-  parent: 22:ac6d600735a4 tip
+  parent: 21:f344982e63c4 tip
    More addition
   branch: default
   commit: (clean)
@@ -270,11 +272,11 @@
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
-  # Node ID ac6d600735a49ee377e29d1f74a0576e8c972e7b
-  # Parent  355c5cda4de162658ed9f961a98a73a10b3167b1
+  # Node ID f344982e63c462b1e44c0371c804685389e673a9
+  # Parent  7bc2f5967f5e4ed277f60a89b7b04cc5d6407ced
   More addition
   
-  diff -r 355c5cda4de1 -r ac6d600735a4 a
+  diff -r 7bc2f5967f5e -r f344982e63c4 a
   --- a/a	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,9 @@
@@ -298,18 +300,18 @@
   $ hg amend
   2 new divergent changesets
   $ hg phase 'divergent()'
-  22: draft
-  24: draft
+  21: draft
+  23: draft
   $ hg evolve -qn
-  hg update -c c956a4b140b6 &&
-  hg merge ac6d600735a4 &&
-  hg commit -m "auto merge resolving conflict between c956a4b140b6 and ac6d600735a4"&&
-  hg up -C 7391601a4bfa &&
+  hg update -c 36e188246d67 &&
+  hg merge f344982e63c4 &&
+  hg commit -m "auto merge resolving conflict between 36e188246d67 and f344982e63c4"&&
+  hg up -C 3932c176bbaa &&
   hg revert --all --rev tip &&
-  hg commit -m "`hg log -r c956a4b140b6 --template={desc}`";
+  hg commit -m "`hg log -r 36e188246d67 --template={desc}`";
   $ hg evolve
-  merge:[24] More addition
-  with: [22] More addition
+  merge:[23] More addition
+  with: [21] More addition
   base: [15] More addition
   merging a
   warning: conflicts during merge.