--- a/tests/test-evolve-content-divergent-basic.t Tue May 05 16:29:52 2020 +0800
+++ b/tests/test-evolve-content-divergent-basic.t Thu Apr 30 10:05:14 2020 -0700
@@ -142,9 +142,9 @@
with: [3] divergent
base: [1] added b
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- working directory is now at 45bf1312f454
+ working directory is now at cfcd9a3d0588
$ hg log -G
- @ 4:45bf1312f454@default(draft) divergent []
+ @ 4:cfcd9a3d0588@default(draft) divergent []
|
o 0:9092f1db7931@default(draft) added a []
@@ -153,7 +153,7 @@
# User test
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
- # Node ID 45bf1312f45468b76158b33f8426e6530c8b35b1
+ # Node ID cfcd9a3d0588dd3abd278373246f2bdd6a646647
# Parent 9092f1db7931481f93b37d5c9fbcfc341bcd7318
divergent
@@ -240,10 +240,10 @@
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
content divergent changesets on different branches.
choose branch for the resolution changeset. (a) default or (b) watwat or (c) foobar? c
- working directory is now at 0ac42f1bc15c
+ working directory is now at f7d7ae0f2678
$ hg glog
- @ 7:0ac42f1bc15c added d
+ @ 7:f7d7ae0f2678 added d
| () [foobar] draft
o 3:ca1b80f7960a added c
| () [default] draft
@@ -276,7 +276,7 @@
$ hg glog
@ 9:59081c9c425a added a d with bar in it, expect some beers
| () [default] draft
- | * 8:f621d00f5f0e added d
+ | * 8:41db48ee7fab added d
|/ () [foobar] draft
o 3:ca1b80f7960a added c
| () [default] draft
@@ -292,10 +292,10 @@
with: [8] added d
base: [7] added d
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- working directory is now at a9d6fd6b5e40
+ working directory is now at 687b947d0a60
$ hg glog
- @ 10:a9d6fd6b5e40 added a d with bar in it, expect some beers
+ @ 10:687b947d0a60 added a d with bar in it, expect some beers
| () [default] draft
o 3:ca1b80f7960a added c
| () [default] draft
@@ -313,18 +313,18 @@
$ hg up 'predecessors(.)' --hidden
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- updated to hidden changeset a9d6fd6b5e40
- (hidden revision 'a9d6fd6b5e40' was rewritten as: b10b07a394f1)
- working directory parent is obsolete! (a9d6fd6b5e40)
- (use 'hg evolve' to update to its successor: b10b07a394f1)
+ updated to hidden changeset 687b947d0a60
+ (hidden revision '687b947d0a60' was rewritten as: 7b36e4bdcf1b)
+ working directory parent is obsolete! (687b947d0a60)
+ (use 'hg evolve' to update to its successor: 7b36e4bdcf1b)
$ echo babar > d
$ hg amend -m "foo to d"
2 new content-divergent changesets
$ hg glog
- @ 12:0bb497fed24a foo to d
+ @ 12:9de05413bc4d foo to d
| () [default] draft
- | * 11:b10b07a394f1 foo to d
+ | * 11:7b36e4bdcf1b foo to d
|/ () [default] draft
o 3:ca1b80f7960a added c
| () [default] draft
@@ -351,10 +351,10 @@
(no more unresolved files)
continue: hg evolve --continue
$ hg evolve --continue
- working directory is now at 11175423b5dc
+ working directory is now at 348265c659d9
$ hg glog
- @ 13:11175423b5dc foo to d
+ @ 13:348265c659d9 foo to d
| () [default] draft
o 3:ca1b80f7960a added c
| () [default] draft
@@ -373,18 +373,18 @@
$ hg up 'predecessors(.)' --hidden
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- updated to hidden changeset 11175423b5dc
- (hidden revision '11175423b5dc' was rewritten as: 27f0463f169a)
- working directory parent is obsolete! (11175423b5dc)
- (use 'hg evolve' to update to its successor: 27f0463f169a)
+ updated to hidden changeset 348265c659d9
+ (hidden revision '348265c659d9' was rewritten as: e0633eb64c66)
+ working directory parent is obsolete! (348265c659d9)
+ (use 'hg evolve' to update to its successor: e0633eb64c66)
$ echo wat > d
$ hg amend -m "wat to d, wat?"
2 new content-divergent changesets
$ hg glog
- @ 15:f542037ddf31 wat to d, wat?
+ @ 15:3eec13f9b72e wat to d, wat?
| () [default] draft
- | * 14:27f0463f169a bar to d, expect beers
+ | * 14:e0633eb64c66 bar to d, expect beers
|/ () [default] draft
o 3:ca1b80f7960a added c
| () [default] draft
@@ -434,10 +434,10 @@
**done showing editors text**
- working directory is now at 89ea3eee2d69
+ working directory is now at 39483e49e3bb
$ hg glog
- @ 16:89ea3eee2d69 watbar to d
+ @ 16:39483e49e3bb watbar to d
| () [default] draft
o 3:ca1b80f7960a added c
| () [default] draft
@@ -533,15 +533,15 @@
a
committing manifest
committing changelog
- working directory is now at 5bf84d1d71d1
+ working directory is now at b4deda8116ef
$ hg st
$ glog
- @ 4:5bf84d1d71d1@default(draft) bk:[] More addition
+ @ 4:b4deda8116ef@default(draft) bk:[] More addition
|
o 0:6569b5a81c7e@default(public) bk:[] root
$ hg summary
- parent: 4:5bf84d1d71d1 tip
+ parent: 4:b4deda8116ef tip
More addition
branch: default
commit: (clean)
@@ -552,7 +552,7 @@
# User test
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
- # Node ID 5bf84d1d71d12f451bfe1e09b93045eb6338cd6c
+ # Node ID b4deda8116effeb6eeabd0a14f40cc8b21ca1b37
# Parent 6569b5a81c7e307ddc076550e8c0f6d75b6effcd
More addition
@@ -577,9 +577,9 @@
$ hg up --hidden 'min(desc("More addition"))'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to hidden changeset 867e43582046
- (hidden revision '867e43582046' was rewritten as: 5bf84d1d71d1)
+ (hidden revision '867e43582046' was rewritten as: b4deda8116ef)
working directory parent is obsolete! (867e43582046)
- (use 'hg evolve' to update to its successor: 5bf84d1d71d1)
+ (use 'hg evolve' to update to its successor: b4deda8116ef)
$ echo 'gotta break' >> a
$ hg amend
2 new content-divergent changesets
@@ -594,15 +594,15 @@
$ glog
@ 6:13c1b75640a1@default(draft) bk:[] More addition (2)
|
- | * 4:5bf84d1d71d1@default(draft) bk:[] More addition
+ | * 4:b4deda8116ef@default(draft) bk:[] More addition
|/
o 0:6569b5a81c7e@default(public) bk:[] root
$ hg evolve -qn --content-divergent --no-all
hg update -c 13c1b75640a1 &&
- hg merge 5bf84d1d71d1 &&
- hg commit -m "auto merge resolving conflict between 13c1b75640a1 and 5bf84d1d71d1"&&
+ hg merge b4deda8116ef &&
+ hg commit -m "auto merge resolving conflict between 13c1b75640a1 and b4deda8116ef"&&
hg up -C 867e43582046 &&
hg revert --all --rev tip &&
hg commit -m "`hg log -r 13c1b75640a1 --template={desc}`";
@@ -633,9 +633,9 @@
(no more unresolved files)
continue: hg evolve --continue
$ hg evolve --continue
- working directory is now at 2346e1147fed
+ working directory is now at 4a175c20d152
$ glog
- @ 7:2346e1147fed@default(draft) bk:[] More addition (2)
+ @ 7:4a175c20d152@default(draft) bk:[] More addition (2)
|
o 0:6569b5a81c7e@default(public) bk:[] root
@@ -644,7 +644,7 @@
# User test
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
- # Node ID 2346e1147fedc8c9aa17f9ba7870dcd8be52f567
+ # Node ID 4a175c20d152f8f4266a3b85a5dcf74b5a032719
# Parent 6569b5a81c7e307ddc076550e8c0f6d75b6effcd
More addition (2)
@@ -964,7 +964,7 @@
merging numbers
merging romans
1 files updated, 2 files merged, 0 files removed, 0 files unresolved
- working directory is now at aae293050980
+ working directory is now at ce0aaa423a89
$ hg status
$ hg amend -m 'E4'
$ hg export
@@ -972,7 +972,7 @@
# User test
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
- # Node ID 8c2a6aae4bc5c1cc00c68276017dcef3d468e895
+ # Node ID b8e4a5a633b6fb38bbc9011601b3342573733083
# Parent 6d1fdf6de7e2d9fc9b098aa286b60785bbeaab7a
E4
@@ -995,22 +995,22 @@
-VI
+vi
$ hg log -G
- @ 5:8c2a6aae4bc5@default(draft) E4 []
+ @ 5:b8e4a5a633b6@default(draft) E4 []
|
o 0:6d1fdf6de7e2@default(draft) root []
$ hg debugobsolete
4a250e5bd992a897655e3b6f238e12452cf063e9 084ae625fa51ca8c441ba1d2bf0f974b21671017 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'}
4a250e5bd992a897655e3b6f238e12452cf063e9 19ed1bf64a2cc2a824df5ac33a436eca1ae0475d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'}
- 084ae625fa51ca8c441ba1d2bf0f974b21671017 aae2930509804c5a84e559eb9d631abeb9c0a340 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'evolve', 'user': 'test'}
- 19ed1bf64a2cc2a824df5ac33a436eca1ae0475d aae2930509804c5a84e559eb9d631abeb9c0a340 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'evolve', 'user': 'test'}
- aae2930509804c5a84e559eb9d631abeb9c0a340 8c2a6aae4bc5c1cc00c68276017dcef3d468e895 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
+ 084ae625fa51ca8c441ba1d2bf0f974b21671017 ce0aaa423a89436c9a9b320283dc0cc89f04a91d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '11', 'operation': 'evolve', 'user': 'test'}
+ 19ed1bf64a2cc2a824df5ac33a436eca1ae0475d ce0aaa423a89436c9a9b320283dc0cc89f04a91d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '11', 'operation': 'evolve', 'user': 'test'}
+ ce0aaa423a89436c9a9b320283dc0cc89f04a91d b8e4a5a633b6fb38bbc9011601b3342573733083 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
$ hg obslog --patch
- @ 8c2a6aae4bc5 (5) E4
+ @ b8e4a5a633b6 (5) E4
|
- x aae293050980 (4) <<<<<<< divergent
- |\ reworded(description) as 8c2a6aae4bc5 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
- | | diff -r aae293050980 -r 8c2a6aae4bc5 changeset-description
+ x ce0aaa423a89 (4) <<<<<<< divergent
+ |\ reworded(description) as b8e4a5a633b6 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | diff -r ce0aaa423a89 -r b8e4a5a633b6 changeset-description
| | --- a/changeset-description
| | +++ b/changeset-description
| | @@ -1,4 +1,1 @@
@@ -1022,8 +1022,8 @@
| |
| |
x | 084ae625fa51 (2) E2
- | | rewritten(description, content) as aae293050980 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
- | | diff -r 084ae625fa51 -r aae293050980 changeset-description
+ | | rewritten(description, meta, content) as ce0aaa423a89 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | diff -r 084ae625fa51 -r ce0aaa423a89 changeset-description
| | --- a/changeset-description
| | +++ b/changeset-description
| | @@ -1,1 +1,4 @@
@@ -1054,8 +1054,8 @@
| |
| |
| x 19ed1bf64a2c (3) E3
- |/ rewritten(description, content) as aae293050980 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
- | diff -r 19ed1bf64a2c -r aae293050980 changeset-description
+ |/ rewritten(description, meta, content) as ce0aaa423a89 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ | diff -r 19ed1bf64a2c -r ce0aaa423a89 changeset-description
| --- a/changeset-description
| +++ b/changeset-description
| @@ -1,1 +1,4 @@