test: rename and clarify content of test-unstable-orphan.t
The troubles → instabilities renaming was not applied here.
** Test for handling of phase divergent changesets by `hg evolve` **
====================================================================
$ cat >> $HGRCPATH <<EOF
> [alias]
> glog = log -GT "{rev}:{node|short} {desc|firstline}\n ({bookmarks}) {phase}"
> [extensions]
> rebase =
> EOF
Setting up a public repo
------------------------
$ hg init public
$ cd public
$ echo a > a
$ mkcommit() {
> echo "$1" > "$1"
> hg add "$1"
> hg ci -m "add $1"
> }
$ hg commit -A -m init
adding a
$ cd ..
$ evolvepath=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/
Setting up a private non-publishing repo
----------------------------------------
$ hg clone public private
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd private
$ cat >> .hg/hgrc <<EOF
> [extensions]
> evolve = $evolvepath
> [ui]
> logtemplate = {rev}:{node|short}@{branch}({phase}) {desc|firstline}\n
> [phases]
> publish = false
> EOF
$ cd ..
Setting up couple of more instances of private repo
---------------------------------------------------
$ cp -a private alice
$ cp -a private bob
$ cp -a private split
$ cp -a private split-across-branches
$ cp -a private split-and-amend
$ cp -a private merge-no-conflict
Creating a phase-divergence changeset
-------------------------------------
Alice creating a draft changeset and pushing to main private repo
$ cd alice
$ echo a >> a
$ hg commit -u alice -m 'modify a'
$ hg push ../private
pushing to ../private
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
$ hg glog
@ 1:4d1169d82e47 modify a
| () draft
o 0:d3873e73d99e init
() public
Bob pulling from private repo and pushing to the main public repo making the
changeset public
$ cd ../bob
$ hg pull ../private
pulling from ../private
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
new changesets 4d1169d82e47 (1 drafts)
(run 'hg update' to get a working copy)
$ hg glog
o 1:4d1169d82e47 modify a
| () draft
@ 0:d3873e73d99e init
() public
$ hg push ../public
pushing to ../public
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
$ hg glog
o 1:4d1169d82e47 modify a
| () public
@ 0:d3873e73d99e init
() public
*But* Alice decided to amend the changeset she had and then pulling from public
repo creating phase-divergent changeset locally
$ cd ../alice
$ hg amend -m 'tweak a'
XXX: pull should tell us how to see what is the new phase-divergent changeset
$ hg pull ../public
pulling from ../public
searching for changes
no changes found
1 new phase-divergent changesets
1 local changesets published
$ hg glog
@ 2:98bb3a6cfe1a tweak a
| () draft
| o 1:4d1169d82e47 modify a
|/ () public
o 0:d3873e73d99e init
() public
Using evolve --list to list phase-divergent changesets
------------------------------------------------------
$ hg evolve --list
98bb3a6cfe1a: tweak a
phase-divergent: 4d1169d82e47 (immutable precursor)
XXX-Pulkit: Trying to see instability on public changeset
XXX-Pulkit: this is not helpful
XXX-Marmoute: public changeset "instable themself"
XXX-Marmoute: I'm not sure if we store this information and it is useful to show it.
XXX-Marmoute: We should maybe point the user toward `hg obslog` instead`
$ hg evolve -r 4d1169d8 --list
4d1169d82e47: modify a
Understanding phasedivergence using obslog
------------------------------------------
XXX: There must be mention of phase-divergence here
$ hg obslog -r . --all
@ 98bb3a6cfe1a (2) tweak a
|
o 4d1169d82e47 (1) modify a
rewritten(description) as 98bb3a6cfe1a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
Solving the phase divergence using evolve command
--------------------------------------------------
(We do not solve evolution other than orphan by default because it turned out
it was too confusing for users. We used to behave this way, but having multiple
possible outcome to evolve end up scaring people)
$ hg evolve
nothing to evolve on current working copy parent
(do you want to use --phase-divergent)
[2]
testing the --confirm option
$ hg evolve --phase-divergent --confirm <<EOF
> n
> EOF
recreate:[2] tweak a
atop:[1] modify a
perform evolve? [Ny] n
abort: evolve aborted by user
[255]
testing the --dry-run option
$ hg evolve --phase-divergent --dry-run
recreate:[2] tweak a
atop:[1] modify a
hg rebase --rev 98bb3a6cfe1a --dest d3873e73d99e;
hg update 4d1169d82e47;
hg revert --all --rev 98bb3a6cfe1a;
hg commit --msg "phase-divergent update to 98bb3a6cfe1a"
XXX: evolve should have mentioned that draft commit is just obsoleted in favour
of public one. From the message it looks like a new commit is created.
$ hg evolve --phase-divergent
recreate:[2] tweak a
atop:[1] modify a
no changes to commit
working directory is now at 4d1169d82e47
$ hg glog
@ 1:4d1169d82e47 modify a
| () public
o 0:d3873e73d99e init
() public
Syncying every repo with the new state
--------------------------------------
$ hg push ../public
pushing to ../public
searching for changes
no changes found
2 new obsolescence markers
[1]
$ hg push ../private
pushing to ../private
searching for changes
no changes found
2 new obsolescence markers
[1]
$ hg push ../bob
pushing to ../bob
searching for changes
no changes found
2 new obsolescence markers
[1]
Creating more phase-divergence where a new resolution commit will be formed and
also testing bookmark movement
--------------------------------------------------------------------------------
Alice created a commit and push to private non-publishing repo
$ echo foo > foo
$ hg add foo
$ hg ci -m "added foo to foo"
$ hg glog
@ 3:aa071e5554e3 added foo to foo
| () draft
o 1:4d1169d82e47 modify a
| () public
o 0:d3873e73d99e init
() public
$ hg push ../private
pushing to ../private
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
Bob pulled from the private repo and pushed that to publishing repo
$ cd ../bob
$ hg pull ../private
pulling from ../private
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
new changesets aa071e5554e3 (1 drafts)
(run 'hg update' to get a working copy)
$ hg push ../public
pushing to ../public
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
Alice amended that changeset and then pulled from publishing repo creating
phase-divergence
$ cd ../alice
$ echo bar >> foo
$ hg amend -m "added bar to foo"
$ hg bookmark bm
$ hg pull ../public
pulling from ../public
searching for changes
no changes found
1 new phase-divergent changesets
1 local changesets published
$ hg glog
@ 4:d47f2b37ed82 added bar to foo
| (bm) draft
| o 3:aa071e5554e3 added foo to foo
|/ () public
o 1:4d1169d82e47 modify a
| () public
o 0:d3873e73d99e init
() public
Resolving the new phase-divergence changeset using `hg evolve`
--------------------------------------------------------------
XXX: this should have popped up for a new commit message of the changeset or an
option should be there
XXX: we should document what should user expect where running this, writing this
test I have to go through code base to understand what will be the behavior
$ hg evolve --phase-divergent
recreate:[4] added bar to foo
atop:[3] added foo to foo
committed as 3d62500c673d
working directory is now at 3d62500c673d
$ hg exp
# HG changeset patch
# User test
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
# Node ID 3d62500c673dd1c88bb09a73e86d0210aed6fcb6
# Parent aa071e5554e36080a36cfd24accd5a71e3320f1e
phase-divergent update to aa071e5554e3:
added bar to foo
diff -r aa071e5554e3 -r 3d62500c673d foo
--- a/foo Thu Jan 01 00:00:00 1970 +0000
+++ b/foo Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +1,2 @@
foo
+bar
XXX: the commit message is not best one, we should give option to user to modify
the commit message
$ hg glog
@ 5:3d62500c673d phase-divergent update to aa071e5554e3:
| (bm) draft
o 3:aa071e5554e3 added foo to foo
| () public
o 1:4d1169d82e47 modify a
| () public
o 0:d3873e73d99e init
() public
$ hg obslog -r . --all
@ 3d62500c673d (5) phase-divergent update to aa071e5554e3:
|
x d47f2b37ed82 (4) added bar to foo
| rewritten(description, parent, content) as 3d62500c673d using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
|
o aa071e5554e3 (3) added foo to foo
rewritten(description, content) as d47f2b37ed82 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
Syncing all other repositories
------------------------------
These pushed should not be turned to quiet mode as the output is very helpful to
make sure everything is working fine
$ hg push ../bob
pushing to ../bob
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
2 new obsolescence markers
$ hg push ../private
pushing to ../private
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
2 new obsolescence markers
$ hg push ../public
pushing to ../public
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
2 new obsolescence markers
Creating a phasedivergence changeset where the divergent changeset changed in a
way that we rebase that on old public changeset, there will be conflicts, but
the `hg evolve` command handles it very well and uses `hg revert` logic to
prevent any conflicts
-------------------------------------------------------------------------------
Alice creates one more changeset and pushes to private repo
$ echo bar > bar
$ hg ci -Aqm "added bar to bar"
$ hg push ../private
pushing to ../private
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
Bob pulls from private and pushes to public repo
$ cd ../bob
$ hg pull ../private
pulling from ../private
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
new changesets b756eb10ea73 (1 drafts)
1 local changesets published
(run 'hg update' to get a working copy)
$ hg push ../public
pushing to ../public
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
Alice amends the changeset and then pull from public creating phase-divergence
$ cd ../alice
$ echo foo > bar
$ hg amend -m "foo to bar"
$ hg pull ../public
pulling from ../public
searching for changes
no changes found
1 new phase-divergent changesets
1 local changesets published
$ hg glog
@ 7:2c3560aedead foo to bar
| (bm) draft
| o 6:b756eb10ea73 added bar to bar
|/ () public
o 5:3d62500c673d phase-divergent update to aa071e5554e3:
| () public
o 3:aa071e5554e3 added foo to foo
| () public
o 1:4d1169d82e47 modify a
| () public
o 0:d3873e73d99e init
() public
Resolving the new phase-divergence changeset using `hg evolve`
---------------------------------------------------------------
$ hg evolve --phase-divergent
recreate:[7] foo to bar
atop:[6] added bar to bar
committed as 502e73736632
working directory is now at 502e73736632
$ hg exp
# HG changeset patch
# User test
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
# Node ID 502e737366322886cf628276aa0a2796904453b4
# Parent b756eb10ea73ee4ba69c998e64a5c6e1005d74b5
phase-divergent update to b756eb10ea73:
foo to bar
diff -r b756eb10ea73 -r 502e73736632 bar
--- a/bar Thu Jan 01 00:00:00 1970 +0000
+++ b/bar Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +1,1 @@
-bar
+foo
$ hg glog
@ 8:502e73736632 phase-divergent update to b756eb10ea73:
| (bm) draft
o 6:b756eb10ea73 added bar to bar
| () public
o 5:3d62500c673d phase-divergent update to aa071e5554e3:
| () public
o 3:aa071e5554e3 added foo to foo
| () public
o 1:4d1169d82e47 modify a
| () public
o 0:d3873e73d99e init
() public
Syncing all the repositories
----------------------------
$ hg push ../private
pushing to ../private
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
2 new obsolescence markers
$ hg push ../public
pushing to ../public
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
2 new obsolescence markers
Creating phase-divergence with divergent changeset and precursor having
different parents
-----------------------------------------------------------------------
Alice creates a changeset and pushes to private repo
$ echo x > x
$ hg ci -Am "added x to x"
adding x
$ hg push ../private
pushing to ../private
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
Bob does what he always does, pull from private and push to public, he is acting
as a CI service
$ cd ../bob
$ hg pull ../private
pulling from ../private
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
2 new obsolescence markers
new changesets 502e73736632:2352021b3785 (1 drafts)
(run 'hg update' to get a working copy)
$ hg push ../public
pushing to ../public
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
Alice like always dont care about Bob existence and rebases her changeset and
then pull from public repo creating phase divergence
$ cd ../alice
$ hg rebase -r . -d .^^^
rebasing 9:2352021b3785 "added x to x" (bm tip)
$ hg pull ../public
pulling from ../public
searching for changes
no changes found
1 new phase-divergent changesets
1 local changesets published
$ hg obslog -r .
@ 334e300d6db5 (10) added x to x
|
o 2352021b3785 (9) added x to x
rewritten(parent) as 334e300d6db5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
$ hg glog -r .^::
@ 10:334e300d6db5 added x to x
| (bm) draft
| o 9:2352021b3785 added x to x
| | () public
| o 8:502e73736632 phase-divergent update to b756eb10ea73:
| | () public
| o 6:b756eb10ea73 added bar to bar
|/ () public
o 5:3d62500c673d phase-divergent update to aa071e5554e3:
| () public
~
Using `hg evolve` to resolve phase-divergence
---------------------------------------------
$ hg evolve --phase-divergent
recreate:[10] added x to x
atop:[9] added x to x
rebasing to destination parent: 502e73736632
(leaving bookmark bm)
no changes to commit
working directory is now at 2352021b3785
XXX: we should move bookmark here
$ hg glog
@ 9:2352021b3785 added x to x
| (bm) public
o 8:502e73736632 phase-divergent update to b756eb10ea73:
| () public
o 6:b756eb10ea73 added bar to bar
| () public
o 5:3d62500c673d phase-divergent update to aa071e5554e3:
| () public
o 3:aa071e5554e3 added foo to foo
| () public
o 1:4d1169d82e47 modify a
| () public
o 0:d3873e73d99e init
() public
$ hg obslog -r . b1a0e143e32b --all --hidden
x b1a0e143e32b (11) added x to x
| pruned using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
|
x 334e300d6db5 (10) added x to x
| rewritten(parent) as b1a0e143e32b using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
|
@ 2352021b3785 (9) added x to x
rewritten(parent) as 334e300d6db5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
$ hg exp
# HG changeset patch
# User test
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
# Node ID 2352021b37851be226ebed109b0eb6eada918566
# Parent 502e737366322886cf628276aa0a2796904453b4
added x to x
diff -r 502e73736632 -r 2352021b3785 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 @@
+x
Creating divergence with parent and content change both but not resulting in
conflicts
-----------------------------------------------------------------------------
Alice is tired of pushing and pulling and will create phase-divergence locally
$ hg glog
@ 9:2352021b3785 added x to x
| (bm) public
o 8:502e73736632 phase-divergent update to b756eb10ea73:
| () public
o 6:b756eb10ea73 added bar to bar
| () public
o 5:3d62500c673d phase-divergent update to aa071e5554e3:
| () public
o 3:aa071e5554e3 added foo to foo
| () public
o 1:4d1169d82e47 modify a
| () public
o 0:d3873e73d99e init
() public
$ echo y > y
$ echo foobar >> foo
$ hg add y
$ hg ci -m "y to y and foobar to foo"
$ hg rebase -r . -d .^^^
rebasing 12:dc88f5aa9bc9 "y to y and foobar to foo" (tip)
$ echo foo > y
$ hg amend
Alice making the old changeset public to have content-divergence
$ hg phase -r dc88f5aa9bc9 --public --hidden
1 new phase-divergent changesets
$ hg glog
@ 14:13015a180eee y to y and foobar to foo
| () draft
| o 12:dc88f5aa9bc9 y to y and foobar to foo
| | () public
| o 9:2352021b3785 added x to x
| | (bm) public
| o 8:502e73736632 phase-divergent update to b756eb10ea73:
|/ () public
o 6:b756eb10ea73 added bar to bar
| () public
o 5:3d62500c673d phase-divergent update to aa071e5554e3:
| () public
o 3:aa071e5554e3 added foo to foo
| () public
o 1:4d1169d82e47 modify a
| () public
o 0:d3873e73d99e init
() public
$ hg obslog -r .
@ 13015a180eee (14) y to y and foobar to foo
|
x 211ab84d1689 (13) y to y and foobar to foo
| rewritten(content) as 13015a180eee using amend by test (Thu Jan 01 00:00:00 1970 +0000)
|
o dc88f5aa9bc9 (12) y to y and foobar to foo
rewritten(parent) as 211ab84d1689 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
Resolving divergence using `hg evolve`
-------------------------------------
$ hg evolve --phase-divergent
recreate:[14] y to y and foobar to foo
atop:[12] y to y and foobar to foo
rebasing to destination parent: 2352021b3785
committed as 8c2bb6fb44e9
working directory is now at 8c2bb6fb44e9
$ hg exp
# HG changeset patch
# User test
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
# Node ID 8c2bb6fb44e9443c64b3a2a3d061272c8e25e6ce
# Parent dc88f5aa9bc90a6418899d267d9524205dfb429b
phase-divergent update to dc88f5aa9bc9:
y to y and foobar to foo
diff -r dc88f5aa9bc9 -r 8c2bb6fb44e9 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 @@
-y
+foo
$ hg glog
@ 16:8c2bb6fb44e9 phase-divergent update to dc88f5aa9bc9:
| () draft
o 12:dc88f5aa9bc9 y to y and foobar to foo
| () public
o 9:2352021b3785 added x to x
| (bm) public
o 8:502e73736632 phase-divergent update to b756eb10ea73:
| () public
o 6:b756eb10ea73 added bar to bar
| () public
o 5:3d62500c673d phase-divergent update to aa071e5554e3:
| () public
o 3:aa071e5554e3 added foo to foo
| () public
o 1:4d1169d82e47 modify a
| () public
o 0:d3873e73d99e init
() public
Creating divergence with parent and content change both which results in
conflicts while rebasing on parent
-----------------------------------------------------------------------------
$ echo l > l
$ hg ci -Aqm "added l to l"
$ hg rebase -r . -d .^^^^
rebasing 17:f3794e5a91dc "added l to l" (tip)
$ echo kl > l
$ echo foo > x
$ hg add x
$ hg amend
$ hg obslog -r .
@ 5fd38c0de46e (19) added l to l
|
x 2bfd56949cf0 (18) added l to l
| rewritten(content) as 5fd38c0de46e using amend by test (Thu Jan 01 00:00:00 1970 +0000)
|
x f3794e5a91dc (17) added l to l
rewritten(parent) as 2bfd56949cf0 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
$ hg phase -r f3794e5a91dc --public --hidden
1 new phase-divergent changesets
Resolution using `hg evolve --phase-divergent`
----------------------------------------------
$ hg evolve --phase-divergent
recreate:[19] added l to l
atop:[17] added l to l
rebasing to destination parent: 8c2bb6fb44e9
merging x
warning: conflicts while merging x! (edit, then use 'hg resolve --mark')
fix conflicts and see `hg help evolve.interrupted`
[1]
$ hg diff
diff -r 8c2bb6fb44e9 l
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/l Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@
+kl
diff -r 8c2bb6fb44e9 x
--- a/x Thu Jan 01 00:00:00 1970 +0000
+++ b/x Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +1,5 @@
+<<<<<<< destination: 8c2bb6fb44e9 - test: phase-divergent update to dc88f5aa9...
x
+=======
+foo
+>>>>>>> evolving: 5fd38c0de46e - test: added l to l
$ echo foo > x
$ hg resolve -m
(no more unresolved files)
continue: hg evolve --continue
$ hg evolve --continue
evolving 19:5fd38c0de46e "added l to l"
committed as e3090241a10c
working directory is now at e3090241a10c
$ hg glog
@ 21:e3090241a10c phase-divergent update to f3794e5a91dc:
| () draft
o 17:f3794e5a91dc added l to l
| () public
o 16:8c2bb6fb44e9 phase-divergent update to dc88f5aa9bc9:
| () public
o 12:dc88f5aa9bc9 y to y and foobar to foo
| () public
o 9:2352021b3785 added x to x
| (bm) public
o 8:502e73736632 phase-divergent update to b756eb10ea73:
| () public
o 6:b756eb10ea73 added bar to bar
| () public
o 5:3d62500c673d phase-divergent update to aa071e5554e3:
| () public
o 3:aa071e5554e3 added foo to foo
| () public
o 1:4d1169d82e47 modify a
| () public
o 0:d3873e73d99e init
() public
$ hg exp
# HG changeset patch
# User test
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
# Node ID e3090241a10c320b6132e4673915fd6b19c0de39
# Parent f3794e5a91dc1d4d36fee5c423386b19433a1f48
phase-divergent update to f3794e5a91dc:
added l to l
diff -r f3794e5a91dc -r e3090241a10c l
--- a/l Thu Jan 01 00:00:00 1970 +0000
+++ b/l Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +1,1 @@
-l
+kl
diff -r f3794e5a91dc -r e3090241a10c x
--- a/x Thu Jan 01 00:00:00 1970 +0000
+++ b/x Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +1,1 @@
-x
+foo
Creating phase divergence when couple of changesets are folded into one
------------------------------------------------------------------------
$ hg glog -r .
@ 21:e3090241a10c phase-divergent update to f3794e5a91dc:
| () draft
~
$ echo f > f
$ hg ci -Aqm "added f"
$ echo g > g
$ hg ci -Aqm "added g"
$ hg fold -r . -r .^ --exact
2 changesets folded
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg evolve --list
$ hg phase -r 428f7900a969 --public --hidden
1 new phase-divergent changesets
$ hg glog -r f3794e5a91dc::
@ 24:390acb97e50a added f
| () draft
| o 23:428f7900a969 added g
| | () public
| o 22:21ae52e414e6 added f
|/ () public
o 21:e3090241a10c phase-divergent update to f3794e5a91dc:
| () public
o 17:f3794e5a91dc added l to l
| () public
~
$ hg evolve --list
390acb97e50a: added f
phase-divergent: 21ae52e414e6 (immutable precursor)
phase-divergent: 428f7900a969 (immutable precursor)
Resolving phase divergence using `hg evolve`
$ hg evolve --phase-divergent --all
recreate:[24] added f
atop:[23] added g
rebasing to destination parent: 21ae52e414e6
no changes to commit
working directory is now at 428f7900a969
$ hg glog -r f3794e5a91dc::
@ 23:428f7900a969 added g
| () public
o 22:21ae52e414e6 added f
| () public
o 21:e3090241a10c phase-divergent update to f3794e5a91dc:
| () public
o 17:f3794e5a91dc added l to l
| () public
~
When the public changesets is split causing phase-divergence
------------------------------------------------------------
$ cd ../split
$ echo m > m
$ echo n > n
$ hg ci -Aqm "added m and n"
$ hg glog
@ 1:a51bce62c219 added m and n
| () draft
o 0:d3873e73d99e init
() public
$ hg prev
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
[0] init
$ echo m > m
$ hg ci -Aqm "added m"
$ echo n > n
$ hg ci -Aqm "added n"
$ hg glog
@ 3:e1154ec0206a added n
| () draft
o 2:4f25cd9cd2bf added m
| () draft
| o 1:a51bce62c219 added m and n
|/ () draft
o 0:d3873e73d99e init
() public
$ hg prune -r a51bce62c219 --succ 4f25cd9cd2bf --succ e1154ec0206a --split
1 changesets pruned
$ hg phase -r a51bce62c219 --hidden --public
2 new phase-divergent changesets
$ hg glog
@ 3:e1154ec0206a added n
| () draft
* 2:4f25cd9cd2bf added m
| () draft
| o 1:a51bce62c219 added m and n
|/ () public
o 0:d3873e73d99e init
() public
$ hg evolve --all --phase-divergent
recreate:[2] added m
atop:[1] added m and n
committed as 86419909e017
1 new orphan changesets
recreate:[3] added n
atop:[1] added m and n
rebasing to destination parent: d3873e73d99e
committed as 89ba615ea1ec
working directory is now at 89ba615ea1ec
XXX: this is messy, we should solve things in better way
$ hg glog --hidden
@ 6:89ba615ea1ec phase-divergent update to a51bce62c219:
| () draft
| x 5:ee4af146c5cf added n
| | () draft
+---o 4:86419909e017 phase-divergent update to a51bce62c219:
| | () draft
| | x 3:e1154ec0206a added n
| | | () draft
| | x 2:4f25cd9cd2bf added m
| |/ () draft
o | 1:a51bce62c219 added m and n
|/ () public
o 0:d3873e73d99e init
() public
$ hg obslog -r a51bce62c219 --all
o 86419909e017 (4) phase-divergent update to a51bce62c219:
|
| @ 89ba615ea1ec (6) phase-divergent update to a51bce62c219:
| |
x | 4f25cd9cd2bf (2) added m
| | rewritten(description, parent, content) as 86419909e017 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| |
| x ee4af146c5cf (5) added n
| | rewritten(description, parent, content) as 89ba615ea1ec using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| |
| x e1154ec0206a (3) added n
|/ rewritten(parent) as ee4af146c5cf using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
|
o a51bce62c219 (1) added m and n
rewritten(description, parent, content) as 4f25cd9cd2bf, e1154ec0206a using prune by test (Thu Jan 01 00:00:00 1970 +0000)
XXX: not sure this is the correct
$ hg exp 89ba615ea1ec
# HG changeset patch
# User test
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
# Node ID 89ba615ea1ec3ba5b25db9f7897eb29712d7e5d6
# Parent a51bce62c219f024bc0ae0cc0e3957ee77d7cb46
phase-divergent update to a51bce62c219:
added n
diff -r a51bce62c219 -r 89ba615ea1ec m
--- a/m Thu Jan 01 00:00:00 1970 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-m
XXX: not sure this is correct
$ hg exp 86419909e017
# HG changeset patch
# User test
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
# Node ID 86419909e01787959aa6471aee605c6d604a3e0d
# Parent a51bce62c219f024bc0ae0cc0e3957ee77d7cb46
phase-divergent update to a51bce62c219:
added m
diff -r a51bce62c219 -r 86419909e017 n
--- a/n Thu Jan 01 00:00:00 1970 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-n
When the public changeset is split across various branches
----------------------------------------------------------
$ cd ../split-across-branches
$ echo p > p
$ echo q > q
$ hg ci -Aqm "added p and q"
$ hg prev
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
[0] init
$ echo p > p
$ hg ci -Aqm "added p"
$ hg prev
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
[0] init
$ echo q > q
$ hg ci -Aqm "added q"
$ hg glog
@ 3:bb87595f9a77 added q
| () draft
| o 2:a47263294745 added p
|/ () draft
| o 1:90859808ece6 added p and q
|/ () draft
o 0:d3873e73d99e init
() public
$ hg prune -r 90859808ece6 --succ a47263294745 --succ bb87595f9a77 --split
1 changesets pruned
$ hg phase -r 90859808ece6 --public --hidden
2 new phase-divergent changesets
$ hg glog
@ 3:bb87595f9a77 added q
| () draft
| * 2:a47263294745 added p
|/ () draft
| o 1:90859808ece6 added p and q
|/ () public
o 0:d3873e73d99e init
() public
$ hg evolve --list
a47263294745: added p
phase-divergent: 90859808ece6 (immutable precursor)
bb87595f9a77: added q
phase-divergent: 90859808ece6 (immutable precursor)
$ hg evolve --all --phase-divergent
recreate:[2] added p
atop:[1] added p and q
committed as 25875a9cb640
recreate:[3] added q
atop:[1] added p and q
committed as 26f564f94bcc
working directory is now at 26f564f94bcc
$ hg glog --hidden
@ 5:26f564f94bcc phase-divergent update to 90859808ece6:
| () draft
| o 4:25875a9cb640 phase-divergent update to 90859808ece6:
|/ () draft
| x 3:bb87595f9a77 added q
| | () draft
| | x 2:a47263294745 added p
| |/ () draft
o | 1:90859808ece6 added p and q
|/ () public
o 0:d3873e73d99e init
() public
$ hg obslog -r 90859808ece6 --all
o 25875a9cb640 (4) phase-divergent update to 90859808ece6:
|
| @ 26f564f94bcc (5) phase-divergent update to 90859808ece6:
| |
x | a47263294745 (2) added p
| | rewritten(description, parent, content) as 25875a9cb640 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| |
| x bb87595f9a77 (3) added q
|/ rewritten(description, parent, content) as 26f564f94bcc using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
|
o 90859808ece6 (1) added p and q
rewritten(description, content) as a47263294745, bb87595f9a77 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
XXX: not sure this is correct
$ hg exp 26f564f94bcc
# HG changeset patch
# User test
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
# Node ID 26f564f94bcc34e049eb112fd14ab1e5286f2325
# Parent 90859808ece64c9ca64dd29992db42353c70f164
phase-divergent update to 90859808ece6:
added q
diff -r 90859808ece6 -r 26f564f94bcc p
--- a/p Thu Jan 01 00:00:00 1970 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-p
XXX: not sure this is correct
$ hg exp 25875a9cb640
# HG changeset patch
# User test
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
# Node ID 25875a9cb6400973b846c94f6a80410067c2cb1f
# Parent 90859808ece64c9ca64dd29992db42353c70f164
phase-divergent update to 90859808ece6:
added p
diff -r 90859808ece6 -r 25875a9cb640 q
--- a/q Thu Jan 01 00:00:00 1970 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-q
When the public changeset is split and amended
--------------------------------------------------------------
$ cd ../split-and-amend
$ echo m > m
$ echo n > n
$ hg ci -Aqm "added m and n"
$ hg prev
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
[0] init
$ echo m > m
$ hg ci -Aqm "added m"
$ echo n > n
$ hg ci -Aqm "added n"
$ hg glog
@ 3:e1154ec0206a added n
| () draft
o 2:4f25cd9cd2bf added m
| () draft
| o 1:a51bce62c219 added m and n
|/ () draft
o 0:d3873e73d99e init
() public
$ hg prune -r a51bce62c219 --succ 4f25cd9cd2bf --succ e1154ec0206a --split
1 changesets pruned
$ echo n2 > n
$ hg amend
$ hg phase -r a51bce62c219 --public --hidden
2 new phase-divergent changesets
$ hg glog
@ 4:52ca78bb98c7 added n
| () draft
* 2:4f25cd9cd2bf added m
| () draft
| o 1:a51bce62c219 added m and n
|/ () public
o 0:d3873e73d99e init
() public
$ hg evolve --list
4f25cd9cd2bf: added m
phase-divergent: a51bce62c219 (immutable precursor)
52ca78bb98c7: added n
phase-divergent: a51bce62c219 (immutable precursor)
$ hg evolve --all --phase-divergent
recreate:[2] added m
atop:[1] added m and n
committed as 86419909e017
1 new orphan changesets
recreate:[4] added n
atop:[1] added m and n
rebasing to destination parent: d3873e73d99e
committed as 88b0dae5369a
working directory is now at 88b0dae5369a
$ hg glog --hidden
@ 7:88b0dae5369a phase-divergent update to a51bce62c219:
| () draft
| x 6:98dad8812511 added n
| | () draft
+---o 5:86419909e017 phase-divergent update to a51bce62c219:
| | () draft
| | x 4:52ca78bb98c7 added n
| | | () draft
| | | x 3:e1154ec0206a added n
| | |/ () draft
| | x 2:4f25cd9cd2bf added m
| |/ () draft
o | 1:a51bce62c219 added m and n
|/ () public
o 0:d3873e73d99e init
() public
$ hg obslog -r a51bce62c219 --all
o 86419909e017 (5) phase-divergent update to a51bce62c219:
|
| @ 88b0dae5369a (7) phase-divergent update to a51bce62c219:
| |
x | 4f25cd9cd2bf (2) added m
| | rewritten(description, parent, content) as 86419909e017 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| |
| x 98dad8812511 (6) added n
| | rewritten(description, parent, content) as 88b0dae5369a using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| |
| x 52ca78bb98c7 (4) added n
| | rewritten(parent) as 98dad8812511 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| |
| x e1154ec0206a (3) added n
|/ rewritten(content) as 52ca78bb98c7 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
|
o a51bce62c219 (1) added m and n
rewritten(description, parent, content) as 4f25cd9cd2bf, e1154ec0206a using prune by test (Thu Jan 01 00:00:00 1970 +0000)
XXX: not sure this is correct
$ hg exp 86419909e017
# HG changeset patch
# User test
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
# Node ID 86419909e01787959aa6471aee605c6d604a3e0d
# Parent a51bce62c219f024bc0ae0cc0e3957ee77d7cb46
phase-divergent update to a51bce62c219:
added m
diff -r a51bce62c219 -r 86419909e017 n
--- a/n Thu Jan 01 00:00:00 1970 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-n
XXX: not sure this is correct
$ hg exp 88b0dae5369a
# HG changeset patch
# User test
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
# Node ID 88b0dae5369aaa3bceb6c0b647542594e2c72fb7
# Parent a51bce62c219f024bc0ae0cc0e3957ee77d7cb46
phase-divergent update to a51bce62c219:
added n
diff -r a51bce62c219 -r 88b0dae5369a m
--- a/m Thu Jan 01 00:00:00 1970 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-m
diff -r a51bce62c219 -r 88b0dae5369a n
--- a/n Thu Jan 01 00:00:00 1970 +0000
+++ b/n Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +1,1 @@
-n
+n2
Testing the evolution of a phase-divergent merge with no conflicts
------------------------------------------------------------------
$ cd ../merge-no-conflict
$ echo h > h
$ hg ci -Aqm "added h"
$ hg prev
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
[0] init
$ echo i > i
$ hg ci -Aqm "added i"
$ hg merge -r a53d182199c1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m "merge h and i"
$ hg glog
@ 3:205b2f5ecb7b merge h and i
|\ () draft
| o 2:f0be5e638ecf added i
| | () draft
o | 1:a53d182199c1 added h
|/ () draft
o 0:d3873e73d99e init
() public
$ hg up a53d182199c1
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg merge -r f0be5e638ecf
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m "merge h and i successor"
created new head
$ hg glog
@ 4:8d4acf488ab5 merge h and i successor
|\ () draft
+---o 3:205b2f5ecb7b merge h and i
| |/ () draft
| o 2:f0be5e638ecf added i
| | () draft
o | 1:a53d182199c1 added h
|/ () draft
o 0:d3873e73d99e init
() public
$ hg prune -r 205b2f5ecb7b --succ .
1 changesets pruned
$ hg phase 205b2f5ecb7b --hidden --public
1 new phase-divergent changesets
Resolution of phase-divergent merge commit using `hg evolve`
XXX: we should handle phase-divergent merges
$ hg evolve --phase-divergent
skipping 8d4acf488ab5 : we do not handle merge yet