evolve: rename `evolve_source_*` to `divergence_source_*`
This makes it clearer that this comes from divergence resolution.
--- a/hgext3rd/evolve/evolvecmd.py Thu May 07 07:57:14 2020 -0700
+++ b/hgext3rd/evolve/evolvecmd.py Fri May 08 04:02:22 2020 +0200
@@ -688,8 +688,8 @@
{(b'ui', b'allowemptycommit'): b'true'}, b'evolve'
):
extra = {
- b'evolve_source_local': divergent.hex(),
- b'evolve_source_other': other.hex()
+ b'divergence_source_local': divergent.hex(),
+ b'divergence_source_other': other.hex()
}
newnode = repo.commit(text=desc, user=user, date=date, extra=extra)
new = repo[newnode]
--- a/hgext3rd/evolve/obshistory.py Thu May 07 07:57:14 2020 -0700
+++ b/hgext3rd/evolve/obshistory.py Fri May 08 04:02:22 2020 +0200
@@ -49,8 +49,8 @@
@eh.extsetup
def addtouchnoise(ui):
obsutil.METABLACKLIST.append(re.compile(br'^__touch-noise__$'))
- obsutil.METABLACKLIST.append(re.compile(br'^evolve_source_local$'))
- obsutil.METABLACKLIST.append(re.compile(br'^evolve_source_other$'))
+ obsutil.METABLACKLIST.append(re.compile(br'^divergence_source_local$'))
+ obsutil.METABLACKLIST.append(re.compile(br'^divergence_source_other$'))
@eh.command(
b'obslog|olog',
--- a/tests/test-evolve-content-divergent-basic.t Thu May 07 07:57:14 2020 -0700
+++ b/tests/test-evolve-content-divergent-basic.t Fri May 08 04:02:22 2020 +0200
@@ -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 cfcd9a3d0588
+ working directory is now at 98ab969ac8fb
$ hg log -G
- @ 4:cfcd9a3d0588@default(draft) divergent []
+ @ 4:98ab969ac8fb@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 cfcd9a3d0588dd3abd278373246f2bdd6a646647
+ # Node ID 98ab969ac8fbe315e6d2c24a8eb5eab5b81e4242
# 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 f7d7ae0f2678
+ working directory is now at 15ee7f765bf7
$ hg glog
- @ 7:f7d7ae0f2678 added d
+ @ 7:15ee7f765bf7 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:41db48ee7fab added d
+ | * 8:e6f07f2f33a9 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 687b947d0a60
+ working directory is now at 34e78e1673c1
$ hg glog
- @ 10:687b947d0a60 added a d with bar in it, expect some beers
+ @ 10:34e78e1673c1 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 687b947d0a60
- (hidden revision '687b947d0a60' was rewritten as: 7b36e4bdcf1b)
- working directory parent is obsolete! (687b947d0a60)
- (use 'hg evolve' to update to its successor: 7b36e4bdcf1b)
+ updated to hidden changeset 34e78e1673c1
+ (hidden revision '34e78e1673c1' was rewritten as: c9d0d72972b0)
+ working directory parent is obsolete! (34e78e1673c1)
+ (use 'hg evolve' to update to its successor: c9d0d72972b0)
$ echo babar > d
$ hg amend -m "foo to d"
2 new content-divergent changesets
$ hg glog
- @ 12:9de05413bc4d foo to d
+ @ 12:b4dadb3b47a7 foo to d
| () [default] draft
- | * 11:7b36e4bdcf1b foo to d
+ | * 11:c9d0d72972b0 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 348265c659d9
+ working directory is now at cfd599de811a
$ hg glog
- @ 13:348265c659d9 foo to d
+ @ 13:cfd599de811a 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 348265c659d9
- (hidden revision '348265c659d9' was rewritten as: e0633eb64c66)
- working directory parent is obsolete! (348265c659d9)
- (use 'hg evolve' to update to its successor: e0633eb64c66)
+ updated to hidden changeset cfd599de811a
+ (hidden revision 'cfd599de811a' was rewritten as: ba0941ffb747)
+ working directory parent is obsolete! (cfd599de811a)
+ (use 'hg evolve' to update to its successor: ba0941ffb747)
$ echo wat > d
$ hg amend -m "wat to d, wat?"
2 new content-divergent changesets
$ hg glog
- @ 15:3eec13f9b72e wat to d, wat?
+ @ 15:4127dd63df67 wat to d, wat?
| () [default] draft
- | * 14:e0633eb64c66 bar to d, expect beers
+ | * 14:ba0941ffb747 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 39483e49e3bb
+ working directory is now at b4c8664fa327
$ hg glog
- @ 16:39483e49e3bb watbar to d
+ @ 16:b4c8664fa327 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 b4deda8116ef
+ working directory is now at 6aa6f90a9f68
$ hg st
$ glog
- @ 4:b4deda8116ef@default(draft) bk:[] More addition
+ @ 4:6aa6f90a9f68@default(draft) bk:[] More addition
|
o 0:6569b5a81c7e@default(public) bk:[] root
$ hg summary
- parent: 4:b4deda8116ef tip
+ parent: 4:6aa6f90a9f68 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 b4deda8116effeb6eeabd0a14f40cc8b21ca1b37
+ # Node ID 6aa6f90a9f684b8a4b698234e25c5dad7328b199
# 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: b4deda8116ef)
+ (hidden revision '867e43582046' was rewritten as: 6aa6f90a9f68)
working directory parent is obsolete! (867e43582046)
- (use 'hg evolve' to update to its successor: b4deda8116ef)
+ (use 'hg evolve' to update to its successor: 6aa6f90a9f68)
$ 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:b4deda8116ef@default(draft) bk:[] More addition
+ | * 4:6aa6f90a9f68@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 b4deda8116ef &&
- hg commit -m "auto merge resolving conflict between 13c1b75640a1 and b4deda8116ef"&&
+ hg merge 6aa6f90a9f68 &&
+ hg commit -m "auto merge resolving conflict between 13c1b75640a1 and 6aa6f90a9f68"&&
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 4a175c20d152
+ working directory is now at 22dc0f618f0d
$ glog
- @ 7:4a175c20d152@default(draft) bk:[] More addition (2)
+ @ 7:22dc0f618f0d@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 4a175c20d152f8f4266a3b85a5dcf74b5a032719
+ # Node ID 22dc0f618f0d8714c611e7a683ad229a575f167c
# 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 ce0aaa423a89
+ working directory is now at e7cb08a7241a
$ 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 b8e4a5a633b6fb38bbc9011601b3342573733083
+ # Node ID 50bb00cad3206c79d231a621e319772302a88d8d
# Parent 6d1fdf6de7e2d9fc9b098aa286b60785bbeaab7a
E4
@@ -995,22 +995,22 @@
-VI
+vi
$ hg log -G
- @ 5:b8e4a5a633b6@default(draft) E4 []
+ @ 5:50bb00cad320@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 ce0aaa423a89436c9a9b320283dc0cc89f04a91d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'evolve', 'user': 'test'}
- 19ed1bf64a2cc2a824df5ac33a436eca1ae0475d ce0aaa423a89436c9a9b320283dc0cc89f04a91d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'evolve', 'user': 'test'}
- ce0aaa423a89436c9a9b320283dc0cc89f04a91d b8e4a5a633b6fb38bbc9011601b3342573733083 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
+ 084ae625fa51ca8c441ba1d2bf0f974b21671017 e7cb08a7241a98c908db298b61fc033b27f648c7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'evolve', 'user': 'test'}
+ 19ed1bf64a2cc2a824df5ac33a436eca1ae0475d e7cb08a7241a98c908db298b61fc033b27f648c7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'evolve', 'user': 'test'}
+ e7cb08a7241a98c908db298b61fc033b27f648c7 50bb00cad3206c79d231a621e319772302a88d8d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
$ hg obslog --patch
- @ b8e4a5a633b6 (5) E4
+ @ 50bb00cad320 (5) E4
|
- 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
+ x e7cb08a7241a (4) <<<<<<< divergent
+ |\ reworded(description) as 50bb00cad320 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | diff -r e7cb08a7241a -r 50bb00cad320 changeset-description
| | --- a/changeset-description
| | +++ b/changeset-description
| | @@ -1,4 +1,1 @@
@@ -1022,8 +1022,8 @@
| |
| |
x | 084ae625fa51 (2) E2
- | | rewritten(description, content) as ce0aaa423a89 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
- | | diff -r 084ae625fa51 -r ce0aaa423a89 changeset-description
+ | | rewritten(description, content) as e7cb08a7241a using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | diff -r 084ae625fa51 -r e7cb08a7241a changeset-description
| | --- a/changeset-description
| | +++ b/changeset-description
| | @@ -1,1 +1,4 @@
@@ -1054,8 +1054,8 @@
| |
| |
| x 19ed1bf64a2c (3) E3
- |/ rewritten(description, content) as ce0aaa423a89 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
- | diff -r 19ed1bf64a2c -r ce0aaa423a89 changeset-description
+ |/ rewritten(description, content) as e7cb08a7241a using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ | diff -r 19ed1bf64a2c -r e7cb08a7241a changeset-description
| --- a/changeset-description
| +++ b/changeset-description
| @@ -1,1 +1,4 @@
--- a/tests/test-evolve-content-divergent-corner-cases.t Thu May 07 07:57:14 2020 -0700
+++ b/tests/test-evolve-content-divergent-corner-cases.t Fri May 08 04:02:22 2020 +0200
@@ -79,25 +79,25 @@
with: [3] divergent
base: [1] added b
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- working directory is now at cfcd9a3d0588
+ working directory is now at 98ab969ac8fb
$ hg log -G
- @ 4:cfcd9a3d0588@default(draft) divergent []
+ @ 4:98ab969ac8fb@default(draft) divergent []
|
o 0:9092f1db7931@default(draft) added a []
$ hg debugobsolete
5f6d8a4bf34ab274ccc9f631c2536964b8a3666d 8374d2ddc3a4d48428c3d2f80e4fc86f13736f96 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'}
5f6d8a4bf34ab274ccc9f631c2536964b8a3666d 593c57f2117e33dd0884382f02789d948f548557 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'}
- 593c57f2117e33dd0884382f02789d948f548557 cfcd9a3d0588dd3abd278373246f2bdd6a646647 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
- 8374d2ddc3a4d48428c3d2f80e4fc86f13736f96 cfcd9a3d0588dd3abd278373246f2bdd6a646647 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
+ 593c57f2117e33dd0884382f02789d948f548557 98ab969ac8fbe315e6d2c24a8eb5eab5b81e4242 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
+ 8374d2ddc3a4d48428c3d2f80e4fc86f13736f96 98ab969ac8fbe315e6d2c24a8eb5eab5b81e4242 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
$ hg obslog --all
- @ cfcd9a3d0588 (4) divergent
+ @ 98ab969ac8fb (4) divergent
|\
x | 593c57f2117e (2) divergent
- | | amended(content) as cfcd9a3d0588 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | amended(content) as 98ab969ac8fb using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| |
| x 8374d2ddc3a4 (3) divergent
- |/ amended(content) as cfcd9a3d0588 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ |/ amended(content) as 98ab969ac8fb using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
|
x 5f6d8a4bf34a (1) added b
rewritten(description, content) as 593c57f2117e using prune by test (Thu Jan 01 00:00:00 1970 +0000)
@@ -132,7 +132,7 @@
|/
| o 5:48819a835615@default(draft) add _c []
|/
- | o 4:cfcd9a3d0588@default(draft) divergent []
+ | o 4:98ab969ac8fb@default(draft) divergent []
|/
o 0:9092f1db7931@default(draft) added a []
@@ -148,7 +148,7 @@
|
| * 6:e3ff64ce8d4c@default(draft) add cdivergent1 [content-divergent]
|/
- | o 4:cfcd9a3d0588@default(draft) divergent []
+ | o 4:98ab969ac8fb@default(draft) divergent []
|/
o 0:9092f1db7931@default(draft) added a []
@@ -157,32 +157,32 @@
with: [7] add _c
base: [5] add _c
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
- working directory is now at c7cbb2f2c5ac
+ working directory is now at 6b3776664a25
$ hg log -G
- @ 8:c7cbb2f2c5ac@default(draft) add cdivergent1 []
+ @ 8:6b3776664a25@default(draft) add cdivergent1 []
|
- | o 4:cfcd9a3d0588@default(draft) divergent []
+ | o 4:98ab969ac8fb@default(draft) divergent []
|/
o 0:9092f1db7931@default(draft) added a []
$ hg debugobsolete
5f6d8a4bf34ab274ccc9f631c2536964b8a3666d 8374d2ddc3a4d48428c3d2f80e4fc86f13736f96 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'}
5f6d8a4bf34ab274ccc9f631c2536964b8a3666d 593c57f2117e33dd0884382f02789d948f548557 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'}
- 593c57f2117e33dd0884382f02789d948f548557 cfcd9a3d0588dd3abd278373246f2bdd6a646647 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
- 8374d2ddc3a4d48428c3d2f80e4fc86f13736f96 cfcd9a3d0588dd3abd278373246f2bdd6a646647 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
+ 593c57f2117e33dd0884382f02789d948f548557 98ab969ac8fbe315e6d2c24a8eb5eab5b81e4242 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
+ 8374d2ddc3a4d48428c3d2f80e4fc86f13736f96 98ab969ac8fbe315e6d2c24a8eb5eab5b81e4242 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
48819a83561596ef0aeac4082eaaa8afe4320f3a b2ae71172042972a8e8d2bc11e2b2fe4e0c3aa49 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'prune', 'user': 'test'}
48819a83561596ef0aeac4082eaaa8afe4320f3a e3ff64ce8d4ce33b40d9f367a8ec472fec588ca3 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'}
- e3ff64ce8d4ce33b40d9f367a8ec472fec588ca3 c7cbb2f2c5ac9b4f3433a08a51527d6544d79096 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
- b2ae71172042972a8e8d2bc11e2b2fe4e0c3aa49 c7cbb2f2c5ac9b4f3433a08a51527d6544d79096 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'evolve', 'user': 'test'}
+ e3ff64ce8d4ce33b40d9f367a8ec472fec588ca3 6b3776664a258aa4c7e13f90df20ae9170995217 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
+ b2ae71172042972a8e8d2bc11e2b2fe4e0c3aa49 6b3776664a258aa4c7e13f90df20ae9170995217 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'evolve', 'user': 'test'}
$ hg obslog --all
- @ c7cbb2f2c5ac (8) add cdivergent1
+ @ 6b3776664a25 (8) add cdivergent1
|\
x | b2ae71172042 (7) add _c
- | | reworded(description) as c7cbb2f2c5ac using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | reworded(description) as 6b3776664a25 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| |
| x e3ff64ce8d4c (6) add cdivergent1
- |/ rewritten as c7cbb2f2c5ac using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ |/ rewritten as 6b3776664a25 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
|
x 48819a835615 (5) add _c
amended(content) as b2ae71172042 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
@@ -254,26 +254,26 @@
with: [3] bdivergent
base: [1] add _b
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- working directory is now at e9189d547f9f
+ working directory is now at b87e0354d5cb
$ hg log -G
- @ 4:e9189d547f9f@default(draft) bdivergent []
+ @ 4:b87e0354d5cb@default(draft) bdivergent []
|
o 0:135f39f4bd78@default(draft) add _a []
$ hg debugobsolete
37445b16603b50165d5eb80735fb986c72a2dac1 6b096fb450709a194b21fb9b192fe9b1572c4af0 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'}
37445b16603b50165d5eb80735fb986c72a2dac1 05a6b6a9e633802d2bdd06e6d292982a767d930e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'}
- 05a6b6a9e633802d2bdd06e6d292982a767d930e e9189d547f9f578af31ea4ff8be2ba3a8bd95e7a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
- 6b096fb450709a194b21fb9b192fe9b1572c4af0 e9189d547f9f578af31ea4ff8be2ba3a8bd95e7a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
+ 05a6b6a9e633802d2bdd06e6d292982a767d930e b87e0354d5cb081210298429d8b51de9871155a2 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
+ 6b096fb450709a194b21fb9b192fe9b1572c4af0 b87e0354d5cb081210298429d8b51de9871155a2 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
$ hg obslog --all
- @ e9189d547f9f (4) bdivergent
+ @ b87e0354d5cb (4) bdivergent
|\
x | 05a6b6a9e633 (2) bdivergent
- | | amended(content) as e9189d547f9f using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | amended(content) as b87e0354d5cb using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| |
| x 6b096fb45070 (3) bdivergent
- |/ amended(content) as e9189d547f9f using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ |/ amended(content) as b87e0354d5cb using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
|
x 37445b16603b (1) add _b
rewritten(description, content) as 05a6b6a9e633 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
@@ -356,10 +356,10 @@
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? c
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
- working directory is now at 5deaa504a865
+ working directory is now at 51ee71efed61
$ hg glog -l1
- @ 9:5deaa504a865 updated e
+ @ 9:51ee71efed61 updated e
| () [default] draft
~
@@ -369,16 +369,16 @@
9150fe93bec603cd88d05cda9f6ff13420cb53e9 0 {155349b645beebee15325a9a22dd0c9ef8fbbbd3} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
ff6f7cd76a7c97d938e8fe87f0fc816b66929435 0ceb21ca2557a61433f097e4d64024e37cae2c10 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
de4ea3103326293994c634101e780724346ee89f a2465d1d56d1aee8ed90d2292978456d2be6f7b9 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
- 0ceb21ca2557a61433f097e4d64024e37cae2c10 5deaa504a865ac3f3fe772c50a583a427aa76449 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
- a2465d1d56d1aee8ed90d2292978456d2be6f7b9 5deaa504a865ac3f3fe772c50a583a427aa76449 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
+ 0ceb21ca2557a61433f097e4d64024e37cae2c10 51ee71efed6170064a7155a9a35e56af0292a203 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
+ a2465d1d56d1aee8ed90d2292978456d2be6f7b9 51ee71efed6170064a7155a9a35e56af0292a203 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
$ hg obslog --all
- @ 5deaa504a865 (9) updated e
+ @ 51ee71efed61 (9) updated e
|\
x | 0ceb21ca2557 (7) updated e
- | | amended(content) as 5deaa504a865 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | amended(content) as 51ee71efed61 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| |
| x a2465d1d56d1 (8) updated e
- | | rewritten as 5deaa504a865 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | rewritten as 51ee71efed61 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| |
| x de4ea3103326 (6) updated e
| | rebased(parent) as a2465d1d56d1 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
@@ -441,9 +441,9 @@
with: [3] delete a
base: [1] delete a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- working directory is now at 48942a623d38
+ working directory is now at b1badc7ab394
$ hg glog
- @ 4:48942a623d38 delete a
+ @ 4:b1badc7ab394 delete a
| () [default] draft
o 0:75d2b02c4a5c initial
() [default] draft
@@ -459,16 +459,16 @@
$ hg debugobsolete
dff6e52f5e419381c070159c8038ac948f59283f 0825dcee2670349e749f1df45857fca34f61e350 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
dff6e52f5e419381c070159c8038ac948f59283f 92ecd58f9b05d6c0a1c3833a79359eea4b0268ff 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
- 0825dcee2670349e749f1df45857fca34f61e350 48942a623d383b1ff275f1194ead88d2e697b18b 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
- 92ecd58f9b05d6c0a1c3833a79359eea4b0268ff 48942a623d383b1ff275f1194ead88d2e697b18b 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
+ 0825dcee2670349e749f1df45857fca34f61e350 b1badc7ab394c2b9ed21e2961de43c71c2e2288f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
+ 92ecd58f9b05d6c0a1c3833a79359eea4b0268ff b1badc7ab394c2b9ed21e2961de43c71c2e2288f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
$ hg obslog --all
- @ 48942a623d38 (4) delete a
+ @ b1badc7ab394 (4) delete a
|\
x | 0825dcee2670 (2) delete a
- | | amended(content) as 48942a623d38 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | amended(content) as b1badc7ab394 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| |
| x 92ecd58f9b05 (3) delete a
- |/ amended(content) as 48942a623d38 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ |/ amended(content) as b1badc7ab394 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
|
x dff6e52f5e41 (1) delete a
amended(content) as 0825dcee2670 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
--- a/tests/test-evolve-content-divergent-first-changeset.t Thu May 07 07:57:14 2020 -0700
+++ b/tests/test-evolve-content-divergent-first-changeset.t Fri May 08 04:02:22 2020 +0200
@@ -41,6 +41,6 @@
with: [2] div2
base: [0] test
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
- working directory is now at 3b448ec6f793
+ working directory is now at 62fcb3488421
$ hg evolve --list
--- a/tests/test-evolve-content-divergent-interrupted.t Thu May 07 07:57:14 2020 -0700
+++ b/tests/test-evolve-content-divergent-interrupted.t Fri May 08 04:02:22 2020 +0200
@@ -197,7 +197,7 @@
merge:[5] added d
with: [7] added d
base: [4] added d
- rebasing "divergent" content-divergent changeset e49523854bc8 on 0194d1974f1a
+ rebasing "divergent" content-divergent changeset e49523854bc8 on 4566502c0483
merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
--- a/tests/test-evolve-content-divergent-meta.t Thu May 07 07:57:14 2020 -0700
+++ b/tests/test-evolve-content-divergent-meta.t Fri May 08 04:02:22 2020 +0200
@@ -93,7 +93,7 @@
Make sure resultant cset don't replace the initial user with user running the command:
$ hg log -r tip
- changeset: 5:51370cfb7970
+ changeset: 5:8cabe7248d20
tag: tip
parent: 1:1740ad2a1eda
user: foo <foo@test.com>
@@ -133,7 +133,7 @@
with: [4] added c
base: [2] added c
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- working directory is now at 2c906136b0c8
+ working directory is now at 2300a271820b
$ hg log -r tip | grep "^user"
user: foouser
@@ -154,7 +154,7 @@
with: [5] updated c
base: [2] added c
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
- working directory is now at f530f5fa1045
+ working directory is now at 3d7ae55fbfe4
$ hg log -r tip | grep "^user"
user: baruser, foouser
@@ -219,15 +219,15 @@
with: [4] add foo.txt
base: [1] add foo.txt
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
- working directory is now at 02379380f598
+ working directory is now at bbcfcd9b9e21
$ hg log -r 'desc("add foo.txt")' -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n'
- 5 02379380f598 1969-12-31 23:59 -0000:
+ 5 bbcfcd9b9e21 1969-12-31 23:59 -0000:
date: updated one one side to an older value
$ hg strip .
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
- saved backup bundle to $TESTTMP/divergingdate/.hg/strip-backup/02379380f598-2f67671c-backup.hg
+ saved backup bundle to $TESTTMP/divergingdate/.hg/strip-backup/bbcfcd9b9e21-567273f3-backup.hg
2 new content-divergent changesets
$ hg up tip
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -266,15 +266,15 @@
with: [5] add foo.txt
base: [1] add foo.txt
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
- working directory is now at ab764e1dbab6
+ working directory is now at 4708538fed7d
$ hg log -r . --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n'
- 6 ab764e1dbab6 1969-12-31 23:59 -0000:
+ 6 4708538fed7d 1969-12-31 23:59 -0000:
date: updated one side to an newer value
$ hg strip .
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
- saved backup bundle to $TESTTMP/divergingdate/.hg/strip-backup/ab764e1dbab6-970f1c73-backup.hg
+ saved backup bundle to $TESTTMP/divergingdate/.hg/strip-backup/4708538fed7d-ca550351-backup.hg
2 new content-divergent changesets
$ hg update a25dd7af6cf6 --hidden
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -315,15 +315,15 @@
with: [6] add foo.txt
base: [1] add foo.txt
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- working directory is now at d294ee10286d
+ working directory is now at dbea1c7e245d
$ hg log -r . --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n'
- 7 d294ee10286d 1970-01-01 00:02 +0000:
+ 7 dbea1c7e245d 1970-01-01 00:02 +0000:
date: updated each side to a different value, newer should win
$ hg strip .
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
- saved backup bundle to $TESTTMP/divergingdate/.hg/strip-backup/d294ee10286d-09948d16-backup.hg
+ saved backup bundle to $TESTTMP/divergingdate/.hg/strip-backup/dbea1c7e245d-47ae3d98-backup.hg
2 new content-divergent changesets
$ hg up tip
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -365,8 +365,8 @@
with: [8] add foo.txt
base: [1] add foo.txt
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
- working directory is now at 1cdf2cb09946
+ working directory is now at 10c950c7c11f
$ hg log -r . --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n'
- 9 1cdf2cb09946 1970-01-01 00:13 +0000:
+ 9 10c950c7c11f 1970-01-01 00:13 +0000:
$ cd ..
--- a/tests/test-evolve-content-divergent-relocation.t Thu May 07 07:57:14 2020 -0700
+++ b/tests/test-evolve-content-divergent-relocation.t Fri May 08 04:02:22 2020 +0200
@@ -70,10 +70,10 @@
base: [2] added b
rebasing "other" content-divergent changeset da4b96f4a8d6 on c7586e2a9264
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
- working directory is now at f8f130ec5d39
+ working directory is now at e7fdc662d630
$ hg glog
- @ 8:f8f130ec5d39 added b
+ @ 8:e7fdc662d630 added b
| () [default] draft
| * 4:c41c793e0ef1 added d
| | () [default] draft
@@ -91,11 +91,11 @@
# User test
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
- # Node ID f8f130ec5d399699738abf984a885baa4fa9f06c
+ # Node ID e7fdc662d6305fee2908c3f1630e0b20d6f4689a
# Parent c7586e2a92645e473645847a7b69a6dc52be4276
added b
- diff -r c7586e2a9264 -r f8f130ec5d39 b
+ diff -r c7586e2a9264 -r e7fdc662d630 b
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/b Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@
@@ -105,16 +105,16 @@
b1661037fa25511d0b7ccddf405e336f9d7d3424 7ed0642d644bb9ad93d252dd9ffe7b4729febe48 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
b1661037fa25511d0b7ccddf405e336f9d7d3424 da4b96f4a8d610a85b225583138f681d67e275dd 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
da4b96f4a8d610a85b225583138f681d67e275dd 11f849d7159fa30a63dbbc1a6d251a8d996baeb5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
- 7ed0642d644bb9ad93d252dd9ffe7b4729febe48 f8f130ec5d399699738abf984a885baa4fa9f06c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
- 11f849d7159fa30a63dbbc1a6d251a8d996baeb5 f8f130ec5d399699738abf984a885baa4fa9f06c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
+ 7ed0642d644bb9ad93d252dd9ffe7b4729febe48 e7fdc662d6305fee2908c3f1630e0b20d6f4689a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
+ 11f849d7159fa30a63dbbc1a6d251a8d996baeb5 e7fdc662d6305fee2908c3f1630e0b20d6f4689a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
$ hg obslog --all
- @ f8f130ec5d39 (8) added b
+ @ e7fdc662d630 (8) added b
|\
x | 11f849d7159f (7) added b
- | | amended(content) as f8f130ec5d39 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | amended(content) as e7fdc662d630 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| |
| x 7ed0642d644b (5) added b
- | | rewritten as f8f130ec5d39 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | rewritten as e7fdc662d630 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| |
x | da4b96f4a8d6 (6) added b
|/ rebased(parent) as 11f849d7159f using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
@@ -131,11 +131,11 @@
atop:[8] added b
move:[4] added d
$ hg glog
- o 10:d34e10c64365 added d
+ o 10:be5a8b9faa8a added d
| () [default] draft
- o 9:65f70b47129d added c
+ o 9:e2ce33033e42 added c
| () [default] draft
- @ 8:f8f130ec5d39 added b
+ @ 8:e7fdc662d630 added b
| () [default] draft
o 1:c7586e2a9264 added a
| () [default] draft
@@ -147,7 +147,7 @@
$ echo x > x
$ hg ci -Aqm "added x"
$ hg glog -r .
- @ 11:19fde4a13e16 added x
+ @ 11:801b5920c7ea added x
| () [default] draft
~
@@ -159,24 +159,24 @@
$ hg up 'predecessors(.)' --hidden
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- updated to hidden changeset 19fde4a13e16
- (hidden revision '19fde4a13e16' was rewritten as: 271db13e4ad1)
- working directory parent is obsolete! (19fde4a13e16)
- (use 'hg evolve' to update to its successor: 271db13e4ad1)
+ updated to hidden changeset 801b5920c7ea
+ (hidden revision '801b5920c7ea' was rewritten as: 5cf74a13db18)
+ working directory parent is obsolete! (801b5920c7ea)
+ (use 'hg evolve' to update to its successor: 5cf74a13db18)
$ hg rebase -r . -d 'desc("added d")' --config experimental.evolution.allowdivergence=True
- rebasing 11:19fde4a13e16 "added x"
+ rebasing 11:801b5920c7ea "added x"
2 new content-divergent changesets
$ hg glog
- @ 13:eb9a1b31b6d8 added x
+ @ 13:45e15d6e88f5 added x
| () [default] draft
- | * 12:271db13e4ad1 added foo to x
+ | * 12:5cf74a13db18 added foo to x
| | () [bar] draft
- o | 10:d34e10c64365 added d
+ o | 10:be5a8b9faa8a added d
| | () [default] draft
- o | 9:65f70b47129d added c
+ o | 9:e2ce33033e42 added c
|/ () [default] draft
- o 8:f8f130ec5d39 added b
+ o 8:e7fdc662d630 added b
| () [default] draft
o 1:c7586e2a9264 added a
| () [default] draft
@@ -187,9 +187,9 @@
merge:[13] added x
with: [12] added foo to x
base: [11] added x
- rebasing "other" content-divergent changeset 271db13e4ad1 on d34e10c64365
+ rebasing "other" content-divergent changeset 5cf74a13db18 on be5a8b9faa8a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- working directory is now at 806f7694feb1
+ working directory is now at 4e844ab5e814
$ hg exp
# HG changeset patch
@@ -197,11 +197,11 @@
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
# Branch bar
- # Node ID 806f7694feb1c58fdd7bf656445f3bd5463a008e
- # Parent d34e10c643651d577eef840b427b58d9bd6ae3f0
+ # Node ID 4e844ab5e8142d26fb1f0990486379f2410b0358
+ # Parent be5a8b9faa8af54f115aa168a2c8564acb40c37d
added foo to x
- diff -r d34e10c64365 -r 806f7694feb1 x
+ diff -r be5a8b9faa8a -r 4e844ab5e814 x
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@
@@ -210,13 +210,13 @@
The above `hg exp` and the following log call demonstrates that message, content
and branch change is preserved in case of relocation
$ hg glog
- @ 15:806f7694feb1 added foo to x
+ @ 15:4e844ab5e814 added foo to x
| () [bar] draft
- o 10:d34e10c64365 added d
+ o 10:be5a8b9faa8a added d
| () [default] draft
- o 9:65f70b47129d added c
+ o 9:e2ce33033e42 added c
| () [default] draft
- o 8:f8f130ec5d39 added b
+ o 8:e7fdc662d630 added b
| () [default] draft
o 1:c7586e2a9264 added a
| () [default] draft
@@ -227,30 +227,30 @@
b1661037fa25511d0b7ccddf405e336f9d7d3424 7ed0642d644bb9ad93d252dd9ffe7b4729febe48 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
b1661037fa25511d0b7ccddf405e336f9d7d3424 da4b96f4a8d610a85b225583138f681d67e275dd 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
da4b96f4a8d610a85b225583138f681d67e275dd 11f849d7159fa30a63dbbc1a6d251a8d996baeb5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
- 7ed0642d644bb9ad93d252dd9ffe7b4729febe48 f8f130ec5d399699738abf984a885baa4fa9f06c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
- 11f849d7159fa30a63dbbc1a6d251a8d996baeb5 f8f130ec5d399699738abf984a885baa4fa9f06c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
- ca1b80f7960aae2306287bab52b4090c59af8c29 65f70b47129d8466acbdc70bfb1efef3d05388e7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
- c41c793e0ef1ddb463e85ea9491e377d01127ba2 d34e10c643651d577eef840b427b58d9bd6ae3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
- 19fde4a13e167ceb55fcfd7937268027f7e716f0 271db13e4ad11d4ca78b12e74e7341cb74c05a85 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'amend', 'user': 'test'}
- 19fde4a13e167ceb55fcfd7937268027f7e716f0 eb9a1b31b6d812c036ca547aca2931edde6d1e06 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
- 271db13e4ad11d4ca78b12e74e7341cb74c05a85 16810a5772dd9a27f4c0302d4e41009a2518588c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
- eb9a1b31b6d812c036ca547aca2931edde6d1e06 806f7694feb1c58fdd7bf656445f3bd5463a008e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'evolve', 'user': 'test'}
- 16810a5772dd9a27f4c0302d4e41009a2518588c 806f7694feb1c58fdd7bf656445f3bd5463a008e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
+ 7ed0642d644bb9ad93d252dd9ffe7b4729febe48 e7fdc662d6305fee2908c3f1630e0b20d6f4689a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
+ 11f849d7159fa30a63dbbc1a6d251a8d996baeb5 e7fdc662d6305fee2908c3f1630e0b20d6f4689a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
+ ca1b80f7960aae2306287bab52b4090c59af8c29 e2ce33033e42db2e61a5f71c6dfb52a33efeaf6a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
+ c41c793e0ef1ddb463e85ea9491e377d01127ba2 be5a8b9faa8af54f115aa168a2c8564acb40c37d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
+ 801b5920c7ea8d4ebdbc9cfc1e79e665dea2f211 5cf74a13db180e33dc2df8cd2aa70b21252a2a64 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'amend', 'user': 'test'}
+ 801b5920c7ea8d4ebdbc9cfc1e79e665dea2f211 45e15d6e88f5bd23ba360dff0c7591eca2d99f43 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
+ 5cf74a13db180e33dc2df8cd2aa70b21252a2a64 911c21adca136894a2b35f0a58fae7ee94fa5e61 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
+ 45e15d6e88f5bd23ba360dff0c7591eca2d99f43 4e844ab5e8142d26fb1f0990486379f2410b0358 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'evolve', 'user': 'test'}
+ 911c21adca136894a2b35f0a58fae7ee94fa5e61 4e844ab5e8142d26fb1f0990486379f2410b0358 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
$ hg obslog --all
- @ 806f7694feb1 (15) added foo to x
+ @ 4e844ab5e814 (15) added foo to x
|\
- x | 16810a5772dd (14) added foo to x
- | | rewritten as 806f7694feb1 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ x | 45e15d6e88f5 (13) added x
+ | | rewritten(description, branch, content) as 4e844ab5e814 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| |
- | x eb9a1b31b6d8 (13) added x
- | | rewritten(description, branch, content) as 806f7694feb1 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ | x 911c21adca13 (14) added foo to x
+ | | rewritten as 4e844ab5e814 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| |
- x | 271db13e4ad1 (12) added foo to x
- |/ rebased(parent) as 16810a5772dd using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ | x 5cf74a13db18 (12) added foo to x
+ |/ rebased(parent) as 911c21adca13 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
|
- x 19fde4a13e16 (11) added x
- rewritten(description, branch, content) as 271db13e4ad1 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
- rebased(parent) as eb9a1b31b6d8 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
+ x 801b5920c7ea (11) added x
+ rebased(parent) as 45e15d6e88f5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, branch, content) as 5cf74a13db18 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
Testing when both the content-divergence are on different parents and resolution
@@ -263,7 +263,7 @@
$ echo y > y
$ hg ci -Aqm "added y"
$ hg glog -r .
- @ 16:6a167ad77c24 added y
+ @ 16:ecf1d3992eb4 added y
| () [default] draft
~
@@ -272,28 +272,28 @@
$ hg up 'predecessors(.)' --hidden
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- updated to hidden changeset 6a167ad77c24
- (hidden revision '6a167ad77c24' was rewritten as: 856e7b6a8392)
- working directory parent is obsolete! (6a167ad77c24)
- (use 'hg evolve' to update to its successor: 856e7b6a8392)
+ updated to hidden changeset ecf1d3992eb4
+ (hidden revision 'ecf1d3992eb4' was rewritten as: 9c32d35206fb)
+ working directory parent is obsolete! (ecf1d3992eb4)
+ (use 'hg evolve' to update to its successor: 9c32d35206fb)
$ hg rebase -r . -d 'desc("added foo to x")' --config experimental.evolution.allowdivergence=True
- rebasing 16:6a167ad77c24 "added y"
+ rebasing 16:ecf1d3992eb4 "added y"
2 new content-divergent changesets
$ echo wat > y
$ hg amend
$ hg glog
- @ 19:750fd38fec35 added y
+ @ 19:0faa43228ee7 added y
| () [bar] draft
- | * 17:856e7b6a8392 added y
+ | * 17:9c32d35206fb added y
| | () [default] draft
- o | 15:806f7694feb1 added foo to x
+ o | 15:4e844ab5e814 added foo to x
| | () [bar] draft
- o | 10:d34e10c64365 added d
+ o | 10:be5a8b9faa8a added d
| | () [default] draft
- o | 9:65f70b47129d added c
+ o | 9:e2ce33033e42 added c
|/ () [default] draft
- o 8:f8f130ec5d39 added b
+ o 8:e7fdc662d630 added b
| () [default] draft
o 1:c7586e2a9264 added a
| () [default] draft
@@ -304,7 +304,7 @@
merge:[19] added y
with: [17] added y
base: [16] added y
- rebasing "other" content-divergent changeset 856e7b6a8392 on 806f7694feb1
+ rebasing "other" content-divergent changeset 9c32d35206fb on 4e844ab5e814
merging y
warning: conflicts while merging y! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -317,18 +317,18 @@
(no more unresolved files)
continue: hg evolve --continue
$ hg evolve --continue
- working directory is now at 68ce3ad10d10
+ working directory is now at ba11a9f47a2e
$ hg glog
- @ 21:68ce3ad10d10 added y
+ @ 21:ba11a9f47a2e added y
| () [bar] draft
- o 15:806f7694feb1 added foo to x
+ o 15:4e844ab5e814 added foo to x
| () [bar] draft
- o 10:d34e10c64365 added d
+ o 10:be5a8b9faa8a added d
| () [default] draft
- o 9:65f70b47129d added c
+ o 9:e2ce33033e42 added c
| () [default] draft
- o 8:f8f130ec5d39 added b
+ o 8:e7fdc662d630 added b
| () [default] draft
o 1:c7586e2a9264 added a
| () [default] draft
@@ -339,39 +339,39 @@
b1661037fa25511d0b7ccddf405e336f9d7d3424 7ed0642d644bb9ad93d252dd9ffe7b4729febe48 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
b1661037fa25511d0b7ccddf405e336f9d7d3424 da4b96f4a8d610a85b225583138f681d67e275dd 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
da4b96f4a8d610a85b225583138f681d67e275dd 11f849d7159fa30a63dbbc1a6d251a8d996baeb5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
- 7ed0642d644bb9ad93d252dd9ffe7b4729febe48 f8f130ec5d399699738abf984a885baa4fa9f06c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
- 11f849d7159fa30a63dbbc1a6d251a8d996baeb5 f8f130ec5d399699738abf984a885baa4fa9f06c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
- ca1b80f7960aae2306287bab52b4090c59af8c29 65f70b47129d8466acbdc70bfb1efef3d05388e7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
- c41c793e0ef1ddb463e85ea9491e377d01127ba2 d34e10c643651d577eef840b427b58d9bd6ae3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
- 19fde4a13e167ceb55fcfd7937268027f7e716f0 271db13e4ad11d4ca78b12e74e7341cb74c05a85 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'amend', 'user': 'test'}
- 19fde4a13e167ceb55fcfd7937268027f7e716f0 eb9a1b31b6d812c036ca547aca2931edde6d1e06 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
- 271db13e4ad11d4ca78b12e74e7341cb74c05a85 16810a5772dd9a27f4c0302d4e41009a2518588c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
- eb9a1b31b6d812c036ca547aca2931edde6d1e06 806f7694feb1c58fdd7bf656445f3bd5463a008e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'evolve', 'user': 'test'}
- 16810a5772dd9a27f4c0302d4e41009a2518588c 806f7694feb1c58fdd7bf656445f3bd5463a008e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
- 6a167ad77c24406c8093b735220c7fe75ed313a6 856e7b6a8392638923637851f93d2e6b4196c37f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
- 6a167ad77c24406c8093b735220c7fe75ed313a6 9916514079c2e21fac219b2e31735a065e83ced8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '68', 'operation': 'rebase', 'user': 'test'}
- 9916514079c2e21fac219b2e31735a065e83ced8 750fd38fec355bf4dc56c36443c9b6d59670946c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
- 856e7b6a8392638923637851f93d2e6b4196c37f 1376c32668b4d8f3073bf8dde759afaf4ac512e2 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
- 750fd38fec355bf4dc56c36443c9b6d59670946c 68ce3ad10d102c3d5dafb324a1b90a0a356dbb8e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
- 1376c32668b4d8f3073bf8dde759afaf4ac512e2 68ce3ad10d102c3d5dafb324a1b90a0a356dbb8e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '72', 'operation': 'evolve', 'user': 'test'}
+ 7ed0642d644bb9ad93d252dd9ffe7b4729febe48 e7fdc662d6305fee2908c3f1630e0b20d6f4689a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
+ 11f849d7159fa30a63dbbc1a6d251a8d996baeb5 e7fdc662d6305fee2908c3f1630e0b20d6f4689a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
+ ca1b80f7960aae2306287bab52b4090c59af8c29 e2ce33033e42db2e61a5f71c6dfb52a33efeaf6a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
+ c41c793e0ef1ddb463e85ea9491e377d01127ba2 be5a8b9faa8af54f115aa168a2c8564acb40c37d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
+ 801b5920c7ea8d4ebdbc9cfc1e79e665dea2f211 5cf74a13db180e33dc2df8cd2aa70b21252a2a64 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'amend', 'user': 'test'}
+ 801b5920c7ea8d4ebdbc9cfc1e79e665dea2f211 45e15d6e88f5bd23ba360dff0c7591eca2d99f43 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
+ 5cf74a13db180e33dc2df8cd2aa70b21252a2a64 911c21adca136894a2b35f0a58fae7ee94fa5e61 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
+ 45e15d6e88f5bd23ba360dff0c7591eca2d99f43 4e844ab5e8142d26fb1f0990486379f2410b0358 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'evolve', 'user': 'test'}
+ 911c21adca136894a2b35f0a58fae7ee94fa5e61 4e844ab5e8142d26fb1f0990486379f2410b0358 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
+ ecf1d3992eb4d9700d441013fc4e89014692b461 9c32d35206fb5c3bf0ac814d410914d54a959a87 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
+ ecf1d3992eb4d9700d441013fc4e89014692b461 1bb9315961377c18863281be7634ec8ff9b73ea9 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '68', 'operation': 'rebase', 'user': 'test'}
+ 1bb9315961377c18863281be7634ec8ff9b73ea9 0faa43228ee7fb9c993f076cef7e2ac14c85954b 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
+ 9c32d35206fb5c3bf0ac814d410914d54a959a87 0fc12918c8daa12ca83ce1e2a38e252b063b6276 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
+ 0faa43228ee7fb9c993f076cef7e2ac14c85954b ba11a9f47a2e4a3380c4d5f80f64de41645a6681 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
+ 0fc12918c8daa12ca83ce1e2a38e252b063b6276 ba11a9f47a2e4a3380c4d5f80f64de41645a6681 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '72', 'operation': 'evolve', 'user': 'test'}
$ hg obslog -r . --all
- @ 68ce3ad10d10 (21) added y
+ @ ba11a9f47a2e (21) added y
|\
- x | 1376c32668b4 (20) added y
- | | rewritten(branch, content) as 68ce3ad10d10 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ x | 0faa43228ee7 (19) added y
+ | | amended(content) as ba11a9f47a2e using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| |
- | x 750fd38fec35 (19) added y
- | | amended(content) as 68ce3ad10d10 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ | x 0fc12918c8da (20) added y
+ | | rewritten(branch, content) as ba11a9f47a2e using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| |
- x | 856e7b6a8392 (17) added y
- | | rebased(parent) as 1376c32668b4 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ x | 1bb931596137 (18) added y
+ | | amended(content) as 0faa43228ee7 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
| |
- | x 9916514079c2 (18) added y
- |/ amended(content) as 750fd38fec35 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ | x 9c32d35206fb (17) added y
+ |/ rebased(parent) as 0fc12918c8da using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
|
- x 6a167ad77c24 (16) added y
- amended(content) as 856e7b6a8392 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
- rewritten(branch, parent) as 9916514079c2 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
+ x ecf1d3992eb4 (16) added y
+ rewritten(branch, parent) as 1bb931596137 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
+ amended(content) as 9c32d35206fb using amend by test (Thu Jan 01 00:00:00 1970 +0000)
checking that relocated commit is there
@@ -380,11 +380,11 @@
# User test
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
- # Node ID 1376c32668b4d8f3073bf8dde759afaf4ac512e2
- # Parent 806f7694feb1c58fdd7bf656445f3bd5463a008e
+ # Node ID 0fc12918c8daa12ca83ce1e2a38e252b063b6276
+ # Parent 4e844ab5e8142d26fb1f0990486379f2410b0358
added y
- diff -r 806f7694feb1 -r 1376c32668b4 y
+ diff -r 4e844ab5e814 -r 0fc12918c8da y
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/y Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@
@@ -394,15 +394,15 @@
----------------------------------------------------------------------
$ hg glog
- @ 21:68ce3ad10d10 added y
+ @ 21:ba11a9f47a2e added y
| () [bar] draft
- o 15:806f7694feb1 added foo to x
+ o 15:4e844ab5e814 added foo to x
| () [bar] draft
- o 10:d34e10c64365 added d
+ o 10:be5a8b9faa8a added d
| () [default] draft
- o 9:65f70b47129d added c
+ o 9:e2ce33033e42 added c
| () [default] draft
- o 8:f8f130ec5d39 added b
+ o 8:e7fdc662d630 added b
| () [default] draft
o 1:c7586e2a9264 added a
| () [default] draft
@@ -415,7 +415,7 @@
$ echo z > z
$ hg ci -Aqm "added z"
$ hg glog -r .
- @ 22:2d5d2b8719d6 added z
+ @ 22:2048a66e8834 added z
| () [default] draft
~
@@ -425,30 +425,30 @@
$ hg up 'predecessors(.)' --hidden
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
- updated to hidden changeset 2d5d2b8719d6
- (hidden revision '2d5d2b8719d6' was rewritten as: ff9e3b1b6df8)
- working directory parent is obsolete! (2d5d2b8719d6)
- (use 'hg evolve' to update to its successor: ff9e3b1b6df8)
+ updated to hidden changeset 2048a66e8834
+ (hidden revision '2048a66e8834' was rewritten as: 9bc2ace42175)
+ working directory parent is obsolete! (2048a66e8834)
+ (use 'hg evolve' to update to its successor: 9bc2ace42175)
$ hg rebase -r . -d 'desc("added y")' --config experimental.evolution.allowdivergence=True
- rebasing 22:2d5d2b8719d6 "added z"
+ rebasing 22:2048a66e8834 "added z"
2 new content-divergent changesets
$ echo bar > z
$ hg amend
$ hg glog
- @ 25:f8b6462d0f09 added z
+ @ 25:ad2ec16eca1e added z
| () [bar] draft
- | * 23:ff9e3b1b6df8 added z
+ | * 23:9bc2ace42175 added z
| | () [default] draft
- o | 21:68ce3ad10d10 added y
+ o | 21:ba11a9f47a2e added y
| | () [bar] draft
- o | 15:806f7694feb1 added foo to x
+ o | 15:4e844ab5e814 added foo to x
| | () [bar] draft
- o | 10:d34e10c64365 added d
+ o | 10:be5a8b9faa8a added d
| | () [default] draft
- o | 9:65f70b47129d added c
+ o | 9:e2ce33033e42 added c
|/ () [default] draft
- o 8:f8f130ec5d39 added b
+ o 8:e7fdc662d630 added b
| () [default] draft
o 1:c7586e2a9264 added a
| () [default] draft
@@ -459,7 +459,7 @@
merge:[25] added z
with: [23] added z
base: [22] added z
- rebasing "other" content-divergent changeset ff9e3b1b6df8 on 68ce3ad10d10
+ rebasing "other" content-divergent changeset 9bc2ace42175 on ba11a9f47a2e
merging y
warning: conflicts while merging y! (edit, then use 'hg resolve --mark')
unresolved merge conflicts
@@ -467,16 +467,16 @@
[1]
$ hg diff
- diff -r 68ce3ad10d10 y
+ diff -r ba11a9f47a2e y
--- a/y Thu Jan 01 00:00:00 1970 +0000
+++ b/y Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +1,5 @@
- +<<<<<<< destination: 68ce3ad10d10 bar - test: added y
+ +<<<<<<< destination: ba11a9f47a2e bar - test: added y
watbar
+=======
+foo
- +>>>>>>> evolving: ff9e3b1b6df8 - test: added z
- diff -r 68ce3ad10d10 z
+ +>>>>>>> evolving: 9bc2ace42175 - test: added z
+ diff -r ba11a9f47a2e z
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/z Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@
@@ -488,7 +488,7 @@
continue: hg evolve --continue
$ hg evolve --continue
- evolving 23:ff9e3b1b6df8 "added z"
+ evolving 23:9bc2ace42175 "added z"
merging y
warning: conflicts while merging y! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -497,35 +497,35 @@
[1]
$ hg diff
- diff -r f8b6462d0f09 y
+ diff -r ad2ec16eca1e y
--- a/y Thu Jan 01 00:00:00 1970 +0000
+++ b/y Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +1,5 @@
- +<<<<<<< local: f8b6462d0f09 bar - test: added z
+ +<<<<<<< local: ad2ec16eca1e bar - test: added z
watbar
+=======
+foo
- +>>>>>>> other: 53bfc763e92e - test: added z
+ +>>>>>>> other: a7326a078527 - test: added z
$ echo foo > y
$ hg resolve -m
(no more unresolved files)
continue: hg evolve --continue
$ hg evolve --continue
- working directory is now at d17538c7d8eb
+ working directory is now at 45e55c9ab3d0
$ hg glog
- @ 27:d17538c7d8eb added z
+ @ 27:45e55c9ab3d0 added z
| () [bar] draft
- o 21:68ce3ad10d10 added y
+ o 21:ba11a9f47a2e added y
| () [bar] draft
- o 15:806f7694feb1 added foo to x
+ o 15:4e844ab5e814 added foo to x
| () [bar] draft
- o 10:d34e10c64365 added d
+ o 10:be5a8b9faa8a added d
| () [default] draft
- o 9:65f70b47129d added c
+ o 9:e2ce33033e42 added c
| () [default] draft
- o 8:f8f130ec5d39 added b
+ o 8:e7fdc662d630 added b
| () [default] draft
o 1:c7586e2a9264 added a
| () [default] draft
@@ -538,17 +538,17 @@
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
# Branch bar
- # Node ID d17538c7d8eb057a9ed807d29ff951e9f7940e83
- # Parent 68ce3ad10d102c3d5dafb324a1b90a0a356dbb8e
+ # Node ID 45e55c9ab3d0b4746161fcbe5b6c062eb4647fdb
+ # Parent ba11a9f47a2e4a3380c4d5f80f64de41645a6681
added z
- diff -r 68ce3ad10d10 -r d17538c7d8eb y
+ diff -r ba11a9f47a2e -r 45e55c9ab3d0 y
--- a/y Thu Jan 01 00:00:00 1970 +0000
+++ b/y Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +1,1 @@
-watbar
+foo
- diff -r 68ce3ad10d10 -r d17538c7d8eb z
+ diff -r ba11a9f47a2e -r 45e55c9ab3d0 z
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/z Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@
@@ -558,45 +558,45 @@
b1661037fa25511d0b7ccddf405e336f9d7d3424 7ed0642d644bb9ad93d252dd9ffe7b4729febe48 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
b1661037fa25511d0b7ccddf405e336f9d7d3424 da4b96f4a8d610a85b225583138f681d67e275dd 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
da4b96f4a8d610a85b225583138f681d67e275dd 11f849d7159fa30a63dbbc1a6d251a8d996baeb5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
- 7ed0642d644bb9ad93d252dd9ffe7b4729febe48 f8f130ec5d399699738abf984a885baa4fa9f06c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
- 11f849d7159fa30a63dbbc1a6d251a8d996baeb5 f8f130ec5d399699738abf984a885baa4fa9f06c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
- ca1b80f7960aae2306287bab52b4090c59af8c29 65f70b47129d8466acbdc70bfb1efef3d05388e7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
- c41c793e0ef1ddb463e85ea9491e377d01127ba2 d34e10c643651d577eef840b427b58d9bd6ae3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
- 19fde4a13e167ceb55fcfd7937268027f7e716f0 271db13e4ad11d4ca78b12e74e7341cb74c05a85 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'amend', 'user': 'test'}
- 19fde4a13e167ceb55fcfd7937268027f7e716f0 eb9a1b31b6d812c036ca547aca2931edde6d1e06 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
- 271db13e4ad11d4ca78b12e74e7341cb74c05a85 16810a5772dd9a27f4c0302d4e41009a2518588c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
- eb9a1b31b6d812c036ca547aca2931edde6d1e06 806f7694feb1c58fdd7bf656445f3bd5463a008e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'evolve', 'user': 'test'}
- 16810a5772dd9a27f4c0302d4e41009a2518588c 806f7694feb1c58fdd7bf656445f3bd5463a008e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
- 6a167ad77c24406c8093b735220c7fe75ed313a6 856e7b6a8392638923637851f93d2e6b4196c37f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
- 6a167ad77c24406c8093b735220c7fe75ed313a6 9916514079c2e21fac219b2e31735a065e83ced8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '68', 'operation': 'rebase', 'user': 'test'}
- 9916514079c2e21fac219b2e31735a065e83ced8 750fd38fec355bf4dc56c36443c9b6d59670946c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
- 856e7b6a8392638923637851f93d2e6b4196c37f 1376c32668b4d8f3073bf8dde759afaf4ac512e2 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
- 750fd38fec355bf4dc56c36443c9b6d59670946c 68ce3ad10d102c3d5dafb324a1b90a0a356dbb8e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
- 1376c32668b4d8f3073bf8dde759afaf4ac512e2 68ce3ad10d102c3d5dafb324a1b90a0a356dbb8e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '72', 'operation': 'evolve', 'user': 'test'}
- 2d5d2b8719d63d07b1c4bf5b5ea30b924b00a83e ff9e3b1b6df81fe45e8aad1fa86145588da0d20f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
- 2d5d2b8719d63d07b1c4bf5b5ea30b924b00a83e 30de78f605eb1cf2f31edfe9c34789118e7f47a0 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '68', 'operation': 'rebase', 'user': 'test'}
- 30de78f605eb1cf2f31edfe9c34789118e7f47a0 f8b6462d0f09ea491c801a49094cb452d4197333 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
- ff9e3b1b6df81fe45e8aad1fa86145588da0d20f 53bfc763e92e5ce04f978fde72667eab1d7e01fb 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '12', 'operation': 'evolve', 'user': 'test'}
- f8b6462d0f09ea491c801a49094cb452d4197333 d17538c7d8eb057a9ed807d29ff951e9f7940e83 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
- 53bfc763e92e5ce04f978fde72667eab1d7e01fb d17538c7d8eb057a9ed807d29ff951e9f7940e83 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '72', 'operation': 'evolve', 'user': 'test'}
+ 7ed0642d644bb9ad93d252dd9ffe7b4729febe48 e7fdc662d6305fee2908c3f1630e0b20d6f4689a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
+ 11f849d7159fa30a63dbbc1a6d251a8d996baeb5 e7fdc662d6305fee2908c3f1630e0b20d6f4689a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
+ ca1b80f7960aae2306287bab52b4090c59af8c29 e2ce33033e42db2e61a5f71c6dfb52a33efeaf6a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
+ c41c793e0ef1ddb463e85ea9491e377d01127ba2 be5a8b9faa8af54f115aa168a2c8564acb40c37d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
+ 801b5920c7ea8d4ebdbc9cfc1e79e665dea2f211 5cf74a13db180e33dc2df8cd2aa70b21252a2a64 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'amend', 'user': 'test'}
+ 801b5920c7ea8d4ebdbc9cfc1e79e665dea2f211 45e15d6e88f5bd23ba360dff0c7591eca2d99f43 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
+ 5cf74a13db180e33dc2df8cd2aa70b21252a2a64 911c21adca136894a2b35f0a58fae7ee94fa5e61 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
+ 45e15d6e88f5bd23ba360dff0c7591eca2d99f43 4e844ab5e8142d26fb1f0990486379f2410b0358 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'evolve', 'user': 'test'}
+ 911c21adca136894a2b35f0a58fae7ee94fa5e61 4e844ab5e8142d26fb1f0990486379f2410b0358 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
+ ecf1d3992eb4d9700d441013fc4e89014692b461 9c32d35206fb5c3bf0ac814d410914d54a959a87 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
+ ecf1d3992eb4d9700d441013fc4e89014692b461 1bb9315961377c18863281be7634ec8ff9b73ea9 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '68', 'operation': 'rebase', 'user': 'test'}
+ 1bb9315961377c18863281be7634ec8ff9b73ea9 0faa43228ee7fb9c993f076cef7e2ac14c85954b 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
+ 9c32d35206fb5c3bf0ac814d410914d54a959a87 0fc12918c8daa12ca83ce1e2a38e252b063b6276 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
+ 0faa43228ee7fb9c993f076cef7e2ac14c85954b ba11a9f47a2e4a3380c4d5f80f64de41645a6681 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
+ 0fc12918c8daa12ca83ce1e2a38e252b063b6276 ba11a9f47a2e4a3380c4d5f80f64de41645a6681 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '72', 'operation': 'evolve', 'user': 'test'}
+ 2048a66e8834bda866dcc8c479f091897816833e 9bc2ace42175da7380251fca97730f62ff5b9185 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
+ 2048a66e8834bda866dcc8c479f091897816833e ee19d6cc67048a1a7469268068a1413611720975 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '68', 'operation': 'rebase', 'user': 'test'}
+ ee19d6cc67048a1a7469268068a1413611720975 ad2ec16eca1eac4cf5045b496efa6205652e9a02 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
+ 9bc2ace42175da7380251fca97730f62ff5b9185 a7326a0785271a7bef2e812a9a742fb4256b4a3c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '12', 'operation': 'evolve', 'user': 'test'}
+ ad2ec16eca1eac4cf5045b496efa6205652e9a02 45e55c9ab3d0b4746161fcbe5b6c062eb4647fdb 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
+ a7326a0785271a7bef2e812a9a742fb4256b4a3c 45e55c9ab3d0b4746161fcbe5b6c062eb4647fdb 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '72', 'operation': 'evolve', 'user': 'test'}
$ hg obslog --all
- @ d17538c7d8eb (27) added z
+ @ 45e55c9ab3d0 (27) added z
|\
- x | 53bfc763e92e (26) added z
- | | rewritten(branch, content) as d17538c7d8eb using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ x | a7326a078527 (26) added z
+ | | rewritten(branch, content) as 45e55c9ab3d0 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| |
- | x f8b6462d0f09 (25) added z
- | | amended(content) as d17538c7d8eb using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ | x ad2ec16eca1e (25) added z
+ | | amended(content) as 45e55c9ab3d0 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| |
- | x 30de78f605eb (24) added z
- | | amended(content) as f8b6462d0f09 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ x | 9bc2ace42175 (23) added z
+ | | rewritten(parent, content) as a7326a078527 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| |
- x | ff9e3b1b6df8 (23) added z
- |/ rewritten(parent, content) as 53bfc763e92e using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ | x ee19d6cc6704 (24) added z
+ |/ amended(content) as ad2ec16eca1e using amend by test (Thu Jan 01 00:00:00 1970 +0000)
|
- x 2d5d2b8719d6 (22) added z
- rewritten(branch, parent) as 30de78f605eb using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
- amended(content) as ff9e3b1b6df8 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ x 2048a66e8834 (22) added z
+ amended(content) as 9bc2ace42175 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(branch, parent) as ee19d6cc6704 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
$ cd ..
@@ -660,7 +660,7 @@
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 new orphan changesets
$ hg glog
- o 7:dfabf49594ff divergent
+ o 7:cc3d0c6117c7 divergent
| () [default] draft
| * 5:88473f9137d1 child
| | () [default] draft
@@ -675,9 +675,9 @@
move:[5] child
atop:[7] divergent
$ hg glog
- o 8:6da8b7911364 child
+ o 8:916b4ec3b91f child
| () [default] draft
- o 7:dfabf49594ff divergent
+ o 7:cc3d0c6117c7 divergent
| () [default] draft
o 1:33c576d20069 upstream
| () [default] draft
@@ -687,17 +687,17 @@
898ddd4443b3d5520bf48f22f9411d5a0751cf2e befae61385695f1ae4b78b030ad91075b2b523ef 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
898ddd4443b3d5520bf48f22f9411d5a0751cf2e 4cc21313ecee97ce33265514a0596a192bfa6b3f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
4cc21313ecee97ce33265514a0596a192bfa6b3f bf4fe3a3afeb14c338094f41a35863921856592f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '12', 'operation': 'evolve', 'user': 'test'}
- befae61385695f1ae4b78b030ad91075b2b523ef dfabf49594ff9aa09d71ca6cc8e574e84bf0e651 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
- bf4fe3a3afeb14c338094f41a35863921856592f dfabf49594ff9aa09d71ca6cc8e574e84bf0e651 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
- 88473f9137d12e90055d30bbb9b78dd786520870 6da8b7911364bc7f4cde60ba07e57213c6dfb14e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
+ befae61385695f1ae4b78b030ad91075b2b523ef cc3d0c6117c7400995107497370fa4c2138399cd 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
+ bf4fe3a3afeb14c338094f41a35863921856592f cc3d0c6117c7400995107497370fa4c2138399cd 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
+ 88473f9137d12e90055d30bbb9b78dd786520870 916b4ec3b91fd03826bd4b179051ae3cee633b56 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
$ hg obslog -r 'desc("divergent")' --all
- o dfabf49594ff (7) divergent
+ o cc3d0c6117c7 (7) divergent
|\
x | befae6138569 (3) divergent
- | | amended(content) as dfabf49594ff using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | amended(content) as cc3d0c6117c7 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| |
| x bf4fe3a3afeb (6) divergent
- | | rewritten as dfabf49594ff using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | rewritten as cc3d0c6117c7 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| |
| x 4cc21313ecee (4) divergent
|/ rewritten(parent, content) as bf4fe3a3afeb using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
--- a/tests/test-evolve-content-divergent-stack.t Thu May 07 07:57:14 2020 -0700
+++ b/tests/test-evolve-content-divergent-stack.t Fri May 08 04:02:22 2020 +0200
@@ -148,28 +148,28 @@
merge:[6] added b
with: [10] added b
base: [2] added b
- rebasing "divergent" content-divergent changeset d5f148423c16 on f9ec70805963
+ rebasing "divergent" content-divergent changeset d5f148423c16 on df93a529fa42
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
merge:[7] added c
with: [11] added c
base: [3] added c
- rebasing "divergent" content-divergent changeset 3ce4be6d8e5e on fa0055a90894
+ rebasing "divergent" content-divergent changeset 3ce4be6d8e5e on 365f419742a3
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
merge:[8] added d
with: [12] added d
base: [4] added d
- rebasing "divergent" content-divergent changeset c72d2885eb51 on 0b6449a7ad07
+ rebasing "divergent" content-divergent changeset c72d2885eb51 on a18171c7d9e7
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
- working directory is now at f9ec70805963
+ working directory is now at df93a529fa42
$ hg glog
- o 19:2b48850357ee added d
+ o 19:59d49942cf47 added d
| () [default] draft
- o 17:0b6449a7ad07 added c
+ o 17:a18171c7d9e7 added c
| () [default] draft
- o 15:fa0055a90894 added b
+ o 15:365f419742a3 added b
| () [default] draft
- @ 13:f9ec70805963 watbar to a
+ @ 13:df93a529fa42 watbar to a
| () [default] draft
o 0:8fa14d15e168 added hgignore
() [default] draft
@@ -319,31 +319,31 @@
merge:[11] added b
with: [6] added b
base: [2] added b
- rebasing "divergent" content-divergent changeset 6eb54b5af3fb on c68b60ab6619
- rebasing "other" content-divergent changeset d5f148423c16 on c68b60ab6619
+ rebasing "divergent" content-divergent changeset 6eb54b5af3fb on ebb749d2ace8
+ rebasing "other" content-divergent changeset d5f148423c16 on ebb749d2ace8
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
merge:[12] added c
with: [7] added c
base: [3] added c
- rebasing "divergent" content-divergent changeset 8ed612937375 on ff90e9515d17
- rebasing "other" content-divergent changeset 3ce4be6d8e5e on ff90e9515d17
+ rebasing "divergent" content-divergent changeset 8ed612937375 on 9437917ebe8d
+ rebasing "other" content-divergent changeset 3ce4be6d8e5e on 9437917ebe8d
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
merge:[13] added d
with: [8] added d
base: [4] added d
- rebasing "divergent" content-divergent changeset d45f050514c2 on 4270af019ebe
- rebasing "other" content-divergent changeset c72d2885eb51 on 4270af019ebe
+ rebasing "divergent" content-divergent changeset d45f050514c2 on 8e574c12775a
+ rebasing "other" content-divergent changeset c72d2885eb51 on 8e574c12775a
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
- working directory is now at c68b60ab6619
+ working directory is now at ebb749d2ace8
$ hg glog
- o 24:78efb5c9d581 added d
+ o 24:5ab9b88fbead added d
| () [default] draft
- o 21:4270af019ebe added c
+ o 21:8e574c12775a added c
| () [default] draft
- o 18:ff90e9515d17 added b
+ o 18:9437917ebe8d added b
| () [default] draft
- @ 15:c68b60ab6619 watbar to a
+ @ 15:ebb749d2ace8 watbar to a
| () [default] draft
o 9:2228e3b74514 add newfile
| () [default] draft
@@ -355,7 +355,7 @@
$ hg strip 14: --hidden
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
- saved backup bundle to $TESTTMP/stackrepo1/.hg/strip-backup/c68b60ab6619-a957686d-backup.hg
+ saved backup bundle to $TESTTMP/stackrepo1/.hg/strip-backup/ebb749d2ace8-0585ef5a-backup.hg
8 new content-divergent changesets
Prepare repo to have merge conflicts
@@ -368,7 +368,7 @@
rebasing "other" content-divergent changeset 8e222f257bbf on 2228e3b74514
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
6 new orphan changesets
- working directory is now at c68b60ab6619
+ working directory is now at ebb749d2ace8
$ echo b_conflict > b
$ hg amend -A
adding b
@@ -378,7 +378,7 @@
merge:[11] added b
with: [6] added b
base: [2] added b
- rebasing "divergent" content-divergent changeset 6eb54b5af3fb on 1a1d3f0cfe5a
+ rebasing "divergent" content-divergent changeset 6eb54b5af3fb on 73a960350ce9
merging b
warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
unresolved merge conflicts
@@ -391,7 +391,7 @@
continue: hg evolve --continue
$ hg evolve --continue
evolving 11:6eb54b5af3fb "added b"
- rebasing "other" content-divergent changeset d5f148423c16 on 1a1d3f0cfe5a
+ rebasing "other" content-divergent changeset d5f148423c16 on 73a960350ce9
merging b
warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
unresolved merge conflicts
@@ -408,24 +408,24 @@
merge:[12] added c
with: [7] added c
base: [3] added c
- rebasing "divergent" content-divergent changeset 8ed612937375 on 58f146beb59b
- rebasing "other" content-divergent changeset 3ce4be6d8e5e on 58f146beb59b
+ rebasing "divergent" content-divergent changeset 8ed612937375 on 1b637ec00f24
+ rebasing "other" content-divergent changeset 3ce4be6d8e5e on 1b637ec00f24
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
merge:[13] added d
with: [8] added d
base: [4] added d
- rebasing "divergent" content-divergent changeset d45f050514c2 on 6f6ca0d5d239
- rebasing "other" content-divergent changeset c72d2885eb51 on 6f6ca0d5d239
+ rebasing "divergent" content-divergent changeset d45f050514c2 on fbfadbe143d8
+ rebasing "other" content-divergent changeset c72d2885eb51 on fbfadbe143d8
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
- working directory is now at 1a1d3f0cfe5a
+ working directory is now at 73a960350ce9
$ hg glog
- o 25:b8c8157a53cd added d
+ o 25:bf2836f524a3 added d
| () [default] draft
- o 22:6f6ca0d5d239 added c
+ o 22:fbfadbe143d8 added c
| () [default] draft
- o 19:58f146beb59b added b
+ o 19:1b637ec00f24 added b
| () [default] draft
- @ 16:1a1d3f0cfe5a watbar to a
+ @ 16:73a960350ce9 watbar to a
| () [default] draft
o 9:2228e3b74514 add newfile
| () [default] draft
@@ -436,7 +436,7 @@
--------------------------------------------------------------
$ hg strip 14: --hidden
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
- saved backup bundle to $TESTTMP/stackrepo1/.hg/strip-backup/c68b60ab6619-3384c553-backup.hg
+ saved backup bundle to $TESTTMP/stackrepo1/.hg/strip-backup/ebb749d2ace8-c2c1e937-backup.hg
8 new content-divergent changesets
Insert conflicting changes in between the stack of content-div csets
@@ -477,8 +477,8 @@
merge:[14] added b
with: [17] added b
base: [2] added b
- rebasing "divergent" content-divergent changeset 2a955e808c53 on c68b60ab6619
- rebasing "other" content-divergent changeset 509103439e5e on c68b60ab6619
+ rebasing "divergent" content-divergent changeset 2a955e808c53 on ebb749d2ace8
+ rebasing "other" content-divergent changeset 509103439e5e on ebb749d2ace8
merging b
warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -578,8 +578,8 @@
merge:[14] added b
with: [17] added b
base: [2] added b
- rebasing "divergent" content-divergent changeset 2a955e808c53 on c68b60ab6619
- rebasing "other" content-divergent changeset 509103439e5e on c68b60ab6619
+ rebasing "divergent" content-divergent changeset 2a955e808c53 on ebb749d2ace8
+ rebasing "other" content-divergent changeset 509103439e5e on ebb749d2ace8
merging b
warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -593,7 +593,7 @@
stopped the interrupted evolve
working directory is now at 2a955e808c53
$ hg log -G
- o changeset: 21:c68b60ab6619
+ o changeset: 21:ebb749d2ace8
| tag: tip
| parent: 9:2228e3b74514
| user: test
@@ -641,7 +641,7 @@
+---x changeset: 10:c04ff147ef79
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | obsolete: rewritten using evolve as 21:c68b60ab6619
+ | | obsolete: rewritten using evolve as 21:ebb749d2ace8
| | summary: added a
| |
o | changeset: 9:2228e3b74514
@@ -654,7 +654,7 @@
|/ parent: 0:8fa14d15e168
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: rebased using evolve as 21:c68b60ab6619
+ | obsolete: rebased using evolve as 21:ebb749d2ace8
| summary: watbar to a
|
o changeset: 0:8fa14d15e168
@@ -663,13 +663,13 @@
summary: added hgignore
$ hg obslog -r 'desc("watbar to a")' --all
- o c68b60ab6619 (21) watbar to a
+ o ebb749d2ace8 (21) watbar to a
|\
x | 186bdc2cdfa2 (20) watbar to a
- | | rewritten as c68b60ab6619 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | rewritten as ebb749d2ace8 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| |
| x c04ff147ef79 (10) added a
- | | rewritten(description, content) as c68b60ab6619 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | rewritten(description, content) as ebb749d2ace8 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| |
x | 8e222f257bbf (5) watbar to a
|/ rebased(parent) as 186bdc2cdfa2 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
@@ -699,8 +699,8 @@
merge:[14] added b
with: [17] added b
base: [2] added b
- rebasing "divergent" content-divergent changeset 2a955e808c53 on c68b60ab6619
- rebasing "other" content-divergent changeset 509103439e5e on c68b60ab6619
+ rebasing "divergent" content-divergent changeset 2a955e808c53 on ebb749d2ace8
+ rebasing "other" content-divergent changeset 509103439e5e on ebb749d2ace8
merging b
warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -716,16 +716,16 @@
merge:[15] added c
with: [18] added c
base: [3] added c
- rebasing "divergent" content-divergent changeset 48b0f803817a on f51f02e0d589
- rebasing "other" content-divergent changeset eaf34afe4df3 on f51f02e0d589
+ rebasing "divergent" content-divergent changeset 48b0f803817a on 32bceb5bc91e
+ rebasing "other" content-divergent changeset eaf34afe4df3 on 32bceb5bc91e
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
merge:[16] added d
with: [19] added d
base: [4] added d
- rebasing "divergent" content-divergent changeset 91c8ccb9c241 on f0edb9305414
- rebasing "other" content-divergent changeset c351be27f199 on f0edb9305414
+ rebasing "divergent" content-divergent changeset 91c8ccb9c241 on a87eb9f90df6
+ rebasing "other" content-divergent changeset c351be27f199 on a87eb9f90df6
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
- working directory is now at f51f02e0d589
+ working directory is now at 32bceb5bc91e
$ hg evolve -l
@@ -860,8 +860,8 @@
merge:[7] c
with: [4] c
base: [2] c
- rebasing "divergent" content-divergent changeset ef4885dea3da on 744161d6411b
- rebasing "other" content-divergent changeset fef59171875e on 744161d6411b
+ rebasing "divergent" content-divergent changeset ef4885dea3da on 6813d99f0a9d
+ rebasing "other" content-divergent changeset fef59171875e on 6813d99f0a9d
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Expected result:
@@ -869,15 +869,15 @@
Changeset with description "c" only adds file "c" with content "c".
$ hg glog -l2 -p
- o 12:4f07c2bae326 c
- | () [default] draftdiff -r 744161d6411b -r 4f07c2bae326 c
+ o 12:d5a8159e883f c
+ | () [default] draftdiff -r 6813d99f0a9d -r d5a8159e883f c
| --- /dev/null Thu Jan 01 00:00:00 1970 +0000
| +++ b/c Thu Jan 01 00:00:00 1970 +0000
| @@ -0,0 +1,1 @@
| +c
|
- o 9:744161d6411b b
- | () [default] draftdiff -r 980f7dc84c29 -r 744161d6411b b
+ o 9:6813d99f0a9d b
+ | () [default] draftdiff -r 980f7dc84c29 -r 6813d99f0a9d b
~ --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/b Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@
@@ -963,16 +963,16 @@
merge:[9] added bar and car
with: [5] added bar and car
base: [2] added bar and car
- rebasing "divergent" content-divergent changeset 7dd5b9d42ef3 on 79e1386ae402
- rebasing "other" content-divergent changeset f4ed107810a7 on 79e1386ae402
+ rebasing "divergent" content-divergent changeset 7dd5b9d42ef3 on 586526ab82c5
+ rebasing "other" content-divergent changeset f4ed107810a7 on 586526ab82c5
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
2 new orphan changesets
- working directory is now at 79e1386ae402
+ working directory is now at 586526ab82c5
$ hg glog
- o 15:f0a0eeecf543 added bar and car
+ o 15:e905bb19fd7e added bar and car
| () [default] draft
- @ 12:79e1386ae402 added foo
+ @ 12:586526ab82c5 added foo
| () [default] draft
| * 10:9a1f460df8b5 added dar
| | () [default] draft
--- a/tests/test-evolve-issue5958.t Thu May 07 07:57:14 2020 -0700
+++ b/tests/test-evolve-issue5958.t Fri May 08 04:02:22 2020 +0200
@@ -91,4 +91,4 @@
base: [1] add foo.txt
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 new orphan changesets
- working directory is now at 8b11b92203c7
+ working directory is now at 5899f25049de
--- a/tests/test-evolve-public-content-divergent-corner-cases.t Thu May 07 07:57:14 2020 -0700
+++ b/tests/test-evolve-public-content-divergent-corner-cases.t Fri May 08 04:02:22 2020 +0200
@@ -137,14 +137,14 @@
base: [2] added c
rebasing "other" content-divergent changeset f5f9b4fc8b77 on c9241b0f2d5b
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- committed as 454f3998cb58
- working directory is now at 454f3998cb58
+ committed as 0941937e8302
+ working directory is now at 0941937e8302
$ hg glog -p
- @ 8:454f3998cb58 phase-divergent update to c0d7ee6604ea:
+ @ 8:0941937e8302 phase-divergent update to c0d7ee6604ea:
| draft
|
- | diff -r c0d7ee6604ea -r 454f3998cb58 c
+ | diff -r c0d7ee6604ea -r 0941937e8302 c
| --- a/c Thu Jan 01 00:00:00 1970 +0000
| +++ b/c Thu Jan 01 00:00:00 1970 +0000
| @@ -1,1 +1,2 @@
@@ -447,27 +447,27 @@
continue: hg evolve --continue
$ hg evolve --continue
- committed as 0c67e963324a
- working directory is now at 0c67e963324a
+ committed as bb4d94ae1a5a
+ working directory is now at bb4d94ae1a5a
$ hg export
# HG changeset patch
# User test
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
- # Node ID 0c67e963324a7f1c84ece16c7d971268b862d8bd
+ # Node ID bb4d94ae1a5ac031ba524ef30850f32b9b50a560
# Parent 93cd84bbdacaeb8f881c29a609dbdd30c38cbc57
phase-divergent update to 93cd84bbdaca:
added c e
- diff -r 93cd84bbdaca -r 0c67e963324a d
+ diff -r 93cd84bbdaca -r bb4d94ae1a5a d
--- a/d Thu Jan 01 00:00:00 1970 +0000
+++ b/d Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +1,1 @@
-dd
+resolved
- diff -r 93cd84bbdaca -r 0c67e963324a e
+ diff -r 93cd84bbdaca -r bb4d94ae1a5a e
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/e Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@
--- a/tests/test-evolve-public-content-divergent-main.t Thu May 07 07:57:14 2020 -0700
+++ b/tests/test-evolve-public-content-divergent-main.t Fri May 08 04:02:22 2020 +0200
@@ -77,16 +77,16 @@
base: [1] added b
merging b
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
- committed as d1939bca1663
- working directory is now at d1939bca1663
+ committed as b11d193ede1d
+ working directory is now at b11d193ede1d
Following graph log shows that it correctly merged the two divergent csets:
$ hg glog -p
- @ 5:d1939bca1663 phase-divergent update to 44f360db368f:
+ @ 5:b11d193ede1d phase-divergent update to 44f360db368f:
| draft
|
- | diff -r 44f360db368f -r d1939bca1663 b
+ | diff -r 44f360db368f -r b11d193ede1d b
| --- a/b Thu Jan 01 00:00:00 1970 +0000
| +++ b/b Thu Jan 01 00:00:00 1970 +0000
| @@ -1,2 +1,3 @@
@@ -181,11 +181,11 @@
(no more unresolved files)
continue: hg evolve --continue
$ hg evolve --continue
- committed as c2581b54d60b
- working directory is now at c2581b54d60b
+ committed as 4ae447c511d3
+ working directory is now at 4ae447c511d3
$ hg glog
- @ 5:c2581b54d60b phase-divergent update to 580f2d01e52c:
+ @ 5:4ae447c511d3 phase-divergent update to 580f2d01e52c:
| draft
|
% 2:580f2d01e52c added b
@@ -271,11 +271,11 @@
base: [3] added d
rebasing "other" content-divergent changeset 4291d72ee19a on 155349b645be
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- committed as f725f11cbd60
- working directory is now at f725f11cbd60
+ committed as 07aa587dcd2b
+ working directory is now at 07aa587dcd2b
$ hg glog -l 1
- @ 8:f725f11cbd60 phase-divergent update to 93cd84bbdaca:
+ @ 8:07aa587dcd2b phase-divergent update to 93cd84bbdaca:
| draft
~
@@ -392,20 +392,20 @@
$ hg evolve --continue
evolving 4:f31bcc378766 "added d c e"
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- committed as 334db71a5c88
- working directory is now at 334db71a5c88
+ committed as 4bce4ff71bf9
+ working directory is now at 4bce4ff71bf9
$ hg export
# HG changeset patch
# User test
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
- # Node ID 334db71a5c8882e05b058211106160276f7f4dfc
+ # Node ID 4bce4ff71bf901840aebb0aa87716e878938b55e
# Parent 93cd84bbdacaeb8f881c29a609dbdd30c38cbc57
phase-divergent update to 93cd84bbdaca:
added d c e
- diff -r 93cd84bbdaca -r 334db71a5c88 e
+ diff -r 93cd84bbdaca -r 4bce4ff71bf9 e
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/e Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@
@@ -500,7 +500,7 @@
continue: hg evolve --continue
$ hg evolve --continue
- committed as b1775d4db34b
+ committed as d87a8f56f14a
working directory is now at 93cd84bbdaca
$ hg evolve -l
@@ -628,7 +628,7 @@
continue: hg evolve --continue
$ hg evolve --continue
- committed as 55e73d2050d5
+ committed as ba823b8ff683
working directory is now at 93cd84bbdaca
$ hg evolve -l
--- a/tests/test-sharing.t Thu May 07 07:57:14 2020 -0700
+++ b/tests/test-sharing.t Fri May 08 04:02:22 2020 +0200
@@ -520,12 +520,12 @@
with: [6] fix bug 24 (v2 by alice)
base: [4] fix bug 24 (v1)
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
- working directory is now at 0978c15d2db6
+ working directory is now at f92394e17e33
$ hg log -q -r 'contentdivergent()'
Figure SG10: Bob's repository after fixing divergence.
$ hg --hidden shortlog -G -r 3::
- @ 7:0978 draft fix bug 24 (v2 by bob)
+ @ 7:f923 draft fix bug 24 (v2 by bob)
|
| x 6:e3a5 draft fix bug 24 (v2 by alice)
|/
--- a/tests/test-topic-stack-complex.t Thu May 07 07:57:14 2020 -0700
+++ b/tests/test-topic-stack-complex.t Fri May 08 04:02:22 2020 +0200
@@ -177,7 +177,7 @@
with: [s4] Added e and f
base: [3] Added e and f
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
- working directory is now at e680be04d270
+ working directory is now at 692bc8b2aa4d
$ hg log -r . -T '{date|hgdate}\n'
0 1