--- a/tests/test-evolve-content-divergent-stack.t Wed Apr 08 01:16:59 2020 +0800
+++ b/tests/test-evolve-content-divergent-stack.t Fri May 08 22:18:15 2020 +0800
@@ -148,28 +148,28 @@
merge:[6] added b
with: [10] added b
base: [2] added b
- rebasing "divergent" content-divergent changeset d5f148423c16 on f66f262fff6c
+ 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 eadfd9d70680
+ 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 b2cac10f3836
+ 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 f66f262fff6c
+ working directory is now at df93a529fa42
$ hg glog
- o 19:038fe7db3d88 added d
+ o 19:59d49942cf47 added d
| () [default] draft
- o 17:b2cac10f3836 added c
+ o 17:a18171c7d9e7 added c
| () [default] draft
- o 15:eadfd9d70680 added b
+ o 15:365f419742a3 added b
| () [default] draft
- @ 13:f66f262fff6c 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 74fbf3e6a0b6
- rebasing "other" content-divergent changeset d5f148423c16 on 74fbf3e6a0b6
+ 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 4e29776e83a5
- rebasing "other" content-divergent changeset 3ce4be6d8e5e on 4e29776e83a5
+ 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 77126af93a25
- rebasing "other" content-divergent changeset c72d2885eb51 on 77126af93a25
+ 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 74fbf3e6a0b6
+ working directory is now at ebb749d2ace8
$ hg glog
- o 24:c8f73c376a6e added d
+ o 24:5ab9b88fbead added d
| () [default] draft
- o 21:77126af93a25 added c
+ o 21:8e574c12775a added c
| () [default] draft
- o 18:4e29776e83a5 added b
+ o 18:9437917ebe8d added b
| () [default] draft
- @ 15:74fbf3e6a0b6 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/74fbf3e6a0b6-f3612603-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 74fbf3e6a0b6
+ 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 119989a4317e
+ 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 119989a4317e
+ 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 646bd3372ee7
- rebasing "other" content-divergent changeset 3ce4be6d8e5e on 646bd3372ee7
+ 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 67abc597e636
- rebasing "other" content-divergent changeset c72d2885eb51 on 67abc597e636
+ 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 119989a4317e
+ working directory is now at 73a960350ce9
$ hg glog
- o 25:5e2572194f59 added d
+ o 25:bf2836f524a3 added d
| () [default] draft
- o 22:67abc597e636 added c
+ o 22:fbfadbe143d8 added c
| () [default] draft
- o 19:646bd3372ee7 added b
+ o 19:1b637ec00f24 added b
| () [default] draft
- @ 16:119989a4317e 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/74fbf3e6a0b6-15474722-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 74fbf3e6a0b6
- rebasing "other" content-divergent changeset 509103439e5e on 74fbf3e6a0b6
+ 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 74fbf3e6a0b6
- rebasing "other" content-divergent changeset 509103439e5e on 74fbf3e6a0b6
+ 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:74fbf3e6a0b6
+ 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:74fbf3e6a0b6
+ | | 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:74fbf3e6a0b6
+ | obsolete: rebased using evolve as 21:ebb749d2ace8
| summary: watbar to a
|
o changeset: 0:8fa14d15e168
@@ -663,35 +663,35 @@
summary: added hgignore
$ hg obslog -r 'desc("watbar to a")' --all
- o 74fbf3e6a0b6 (21) watbar to a
- |\
+ o ebb749d2ace8 (21) watbar to a
+ |\ rewritten from 186bdc2cdfa2 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | rewritten(description, content) from c04ff147ef79 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ | |
x | 186bdc2cdfa2 (20) watbar to a
- | | rewritten as 74fbf3e6a0b6 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | rebased(parent) from 8e222f257bbf using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| |
| x c04ff147ef79 (10) added a
- | | rewritten(description, content) as 74fbf3e6a0b6 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | rebased(parent) from c7586e2a9264 using rebase 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)
+ |/ rewritten(description, content) from c7586e2a9264 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
|
x c7586e2a9264 (1) added a
- rewritten(description, content) as 8e222f257bbf using amend by test (Thu Jan 01 00:00:00 1970 +0000)
- rebased(parent) as c04ff147ef79 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
$ hg obslog -r 'desc("added b")' --all
@ 2a955e808c53 (14) added b
+ | amended(content) from 6eb54b5af3fb using amend by test (Thu Jan 01 00:00:00 1970 +0000)
|
| * 509103439e5e (17) added b
+ | | amended(content) from d5f148423c16 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
| |
x | 6eb54b5af3fb (11) added b
- | | amended(content) as 2a955e808c53 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | rebased(parent) from b1661037fa25 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
| |
| x d5f148423c16 (6) added b
- |/ amended(content) as 509103439e5e using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ |/ rebased(parent) from b1661037fa25 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
|
x b1661037fa25 (2) added b
- rebased(parent) as 6eb54b5af3fb using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
- rebased(parent) as d5f148423c16 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
Again, let's evolve the stack
@@ -699,8 +699,8 @@
merge:[14] added b
with: [17] added b
base: [2] added b
- rebasing "divergent" content-divergent changeset 2a955e808c53 on 74fbf3e6a0b6
- rebasing "other" content-divergent changeset 509103439e5e on 74fbf3e6a0b6
+ 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 4e29776e83a5
- rebasing "other" content-divergent changeset eaf34afe4df3 on 4e29776e83a5
+ 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 77126af93a25
- rebasing "other" content-divergent changeset c351be27f199 on 77126af93a25
+ 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 4e29776e83a5
+ 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 0999c349998d
- rebasing "other" content-divergent changeset fef59171875e on 0999c349998d
+ 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:4ca627f76da9 c
- | () [default] draftdiff -r 0999c349998d -r 4ca627f76da9 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:0999c349998d b
- | () [default] draftdiff -r 980f7dc84c29 -r 0999c349998d 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 8ef6ad88580d
- rebasing "other" content-divergent changeset f4ed107810a7 on 8ef6ad88580d
+ 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 8ef6ad88580d
+ working directory is now at 586526ab82c5
$ hg glog
- o 15:09ba686a465e added bar and car
+ o 15:e905bb19fd7e added bar and car
| () [default] draft
- @ 12:8ef6ad88580d added foo
+ @ 12:586526ab82c5 added foo
| () [default] draft
| * 10:9a1f460df8b5 added dar
| | () [default] draft