annotate tests/test-evolve-phase-divergence.t @ 3632:8d38b88233cb

evolve: move logic to resolve phase-divergence in a new function This patch moves logic which does the revert and create a commit on top of public changeset because we need to repeat that logic while handling continuation of `hg evolve` when there are conflicts while rebasing the phase-divergent changeset.
author Pulkit Goyal <7895pulkit@gmail.com>
date Sat, 24 Mar 2018 16:41:14 +0530
parents f23946bf6625
children ed3032ee53eb
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3610
145dab8c60c9 tests: rename test-evolve-bumped to test-evolve-phase-divergence.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3155
diff changeset
1 ** Test for handling of phase divergent changesets by `hg evolve` **
145dab8c60c9 tests: rename test-evolve-bumped to test-evolve-phase-divergence.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3155
diff changeset
2 ====================================================================
145dab8c60c9 tests: rename test-evolve-bumped to test-evolve-phase-divergence.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3155
diff changeset
3
3617
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
4 $ cat >> $HGRCPATH <<EOF
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
5 > [alias]
3625
7e253bbac9a1 tests: show first line of commit message in test-evolve-phase-divergence.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3624
diff changeset
6 > glog = log -GT "{rev}:{node|short} {desc|firstline}\n ({bookmarks}) {phase}"
3621
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
7 > [extensions]
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
8 > rebase =
3617
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
9 > EOF
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
10
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
11 Setting up a public repo
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
12 ------------------------
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
13
1150
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
14 $ hg init public
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
15 $ cd public
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
16 $ echo a > a
1417
9e7da169f66e test-evolve-bumped: add new test case for merge
Laurent Charignon <lcharignon@fb.com>
parents: 1416
diff changeset
17 $ mkcommit() {
9e7da169f66e test-evolve-bumped: add new test case for merge
Laurent Charignon <lcharignon@fb.com>
parents: 1416
diff changeset
18 > echo "$1" > "$1"
9e7da169f66e test-evolve-bumped: add new test case for merge
Laurent Charignon <lcharignon@fb.com>
parents: 1416
diff changeset
19 > hg add "$1"
9e7da169f66e test-evolve-bumped: add new test case for merge
Laurent Charignon <lcharignon@fb.com>
parents: 1416
diff changeset
20 > hg ci -m "add $1"
9e7da169f66e test-evolve-bumped: add new test case for merge
Laurent Charignon <lcharignon@fb.com>
parents: 1416
diff changeset
21 > }
1150
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
22 $ hg commit -A -m init
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
23 adding a
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
24 $ cd ..
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
25
1806
9f42f819267b evolve: move the extensions to 'hgext3rd'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1453
diff changeset
26 $ evolvepath=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/
3617
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
27
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
28 Setting up a private non-publishing repo
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
29 ----------------------------------------
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
30
1150
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
31 $ hg clone -U public private
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
32 $ cd private
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
33 $ cat >> .hg/hgrc <<EOF
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
34 > [extensions]
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
35 > evolve = $evolvepath
1416
b8a9d2e8c772 test-evolve-bumped: improve tests legibility
Laurent Charignon <lcharignon@fb.com>
parents: 1404
diff changeset
36 > [ui]
b8a9d2e8c772 test-evolve-bumped: improve tests legibility
Laurent Charignon <lcharignon@fb.com>
parents: 1404
diff changeset
37 > logtemplate = {rev}:{node|short}@{branch}({phase}) {desc|firstline}\n
1150
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
38 > [phases]
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
39 > publish = false
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
40 > EOF
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
41 $ cd ..
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
42
3617
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
43 Setting up couple of more instances of private repo
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
44 ---------------------------------------------------
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
45
1150
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
46 $ cp -a private alice
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
47 $ cp -a private bob
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
48
3617
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
49 Creating a phase-divergence changeset
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
50 -------------------------------------
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
51
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
52 Alice creating a draft changeset and pushing to main private repo
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
53
1150
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
54 $ cd alice
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
55 $ hg update
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
56 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
57 $ echo a >> a
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
58 $ hg commit -u alice -m 'modify a'
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
59 $ hg push ../private
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
60 pushing to ../private
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
61 searching for changes
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
62 adding changesets
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
63 adding manifests
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
64 adding file changes
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
65 added 1 changesets with 1 changes to 1 files
3617
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
66 $ hg glog
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
67 @ 1:4d1169d82e47 modify a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
68 | () draft
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
69 o 0:d3873e73d99e init
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
70 () public
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
71
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
72 Bob pulling from private repo and pushing to the main public repo making the
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
73 changeset public
1150
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
74
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
75 $ cd ../bob
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
76 $ hg pull ../private
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
77 pulling from ../private
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
78 searching for changes
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
79 adding changesets
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
80 adding manifests
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
81 adding file changes
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
82 added 1 changesets with 1 changes to 1 files
3075
8feb2cae7eae test: adapt to output change from eb586ed5d8ce
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3013
diff changeset
83 new changesets 4d1169d82e47
1150
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
84 (run 'hg update' to get a working copy)
3617
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
85
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
86 $ hg glog
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
87 o 1:4d1169d82e47 modify a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
88 | () draft
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
89 o 0:d3873e73d99e init
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
90 () public
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
91
1150
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
92 $ hg push ../public
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
93 pushing to ../public
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
94 searching for changes
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
95 adding changesets
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
96 adding manifests
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
97 adding file changes
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
98 added 1 changesets with 1 changes to 1 files
3617
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
99
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
100 $ hg glog
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
101 o 1:4d1169d82e47 modify a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
102 | () public
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
103 o 0:d3873e73d99e init
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
104 () public
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
105
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
106 *But* Alice decided to amend the changeset she had and then pulling from public
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
107 repo creating phase-divergent changeset locally
1150
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
108
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
109 $ cd ../alice
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
110 $ hg amend -m 'tweak a'
3618
2d8e39919742 tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3617
diff changeset
111
2d8e39919742 tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3617
diff changeset
112 XXX: pull should tell us how to see what is the new phase-divergent changeset
1150
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
113 $ hg pull ../public
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
114 pulling from ../public
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
115 searching for changes
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
116 no changes found
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
117 1 new phase-divergent changesets
1150
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
118
3617
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
119 $ hg glog
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
120 @ 2:98bb3a6cfe1a tweak a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
121 | () draft
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
122 | o 1:4d1169d82e47 modify a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
123 |/ () public
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
124 o 0:d3873e73d99e init
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
125 () public
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
126
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
127 Using evolve --list to list phase-divergent changesets
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
128 ------------------------------------------------------
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
129
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
130 $ hg evolve --list
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
131 98bb3a6cfe1a: tweak a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
132 phase-divergent: 4d1169d82e47 (immutable precursor)
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
133
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
134
3618
2d8e39919742 tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3617
diff changeset
135
2d8e39919742 tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3617
diff changeset
136 XXX-Pulkit: Trying to see instability on public changeset
3617
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
137
3618
2d8e39919742 tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3617
diff changeset
138 XXX-Pulkit: this is not helpful
2d8e39919742 tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3617
diff changeset
139
2d8e39919742 tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3617
diff changeset
140 XXX-Marmoute: public changeset "instable themself"
2d8e39919742 tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3617
diff changeset
141 XXX-Marmoute: I'm not sure if we store this information and it is useful to show it.
2d8e39919742 tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3617
diff changeset
142 XXX-Marmoute: We should maybe point the user toward `hg obslog` instead`
3617
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
143 $ hg evolve -r 4d1169d8 --list
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
144 4d1169d82e47: modify a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
145
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
146
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
147 Understanding phasedivergence using obslog
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
148 ------------------------------------------
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
149
3618
2d8e39919742 tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3617
diff changeset
150 XXX: There must be mention of phase-divergence here
3617
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
151 $ hg obslog -r . --all
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
152 @ 98bb3a6cfe1a (2) tweak a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
153 |
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
154 o 4d1169d82e47 (1) modify a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
155 rewritten(description) as 98bb3a6cfe1a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
156
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
157 Solving the phase divergence using evolve command
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
158 --------------------------------------------------
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
159
3618
2d8e39919742 tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3617
diff changeset
160 (We do not solve evolution other than orphan by default because it turned out
2d8e39919742 tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3617
diff changeset
161 it was too confusing for users. We used to behave this way, but having multiple
2d8e39919742 tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3617
diff changeset
162 possible outcome to evolve end up scaring people)
2d8e39919742 tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3617
diff changeset
163
3617
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
164 $ hg evolve
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
165 nothing to evolve on current working copy parent
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
166 (do you want to use --phase-divergent)
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
167 [2]
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
168
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
169 testing the --confirm option
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
170 $ hg evolve --phase-divergent --confirm <<EOF
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
171 > n
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
172 > EOF
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
173 recreate:[2] tweak a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
174 atop:[1] modify a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
175 perform evolve? [Ny] n
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
176 abort: evolve aborted by user
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
177 [255]
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
178
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
179 testing the --dry-run option
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
180
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
181 $ hg evolve --phase-divergent --dry-run
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
182 recreate:[2] tweak a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
183 atop:[1] modify a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
184 hg rebase --rev 98bb3a6cfe1a --dest d3873e73d99e;
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
185 hg update 4d1169d82e47;
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
186 hg revert --all --rev 98bb3a6cfe1a;
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
187 hg commit --msg "phase-divergent update to 98bb3a6cfe1a"
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
188
3618
2d8e39919742 tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3617
diff changeset
189 XXX: evolve should have mentioned that draft commit is just obsoleted in favour
2d8e39919742 tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3617
diff changeset
190 of public one. From the message it looks like a new commit is created.
2d8e39919742 tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3617
diff changeset
191
3617
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
192 $ hg evolve --phase-divergent
1150
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
193 recreate:[2] tweak a
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
194 atop:[1] modify a
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
195 computing new diff
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
196 committed as 4d1169d82e47
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
197 working directory is now at 4d1169d82e47
1417
9e7da169f66e test-evolve-bumped: add new test case for merge
Laurent Charignon <lcharignon@fb.com>
parents: 1416
diff changeset
198
3617
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
199 $ hg glog
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
200 @ 1:4d1169d82e47 modify a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
201 | () public
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
202 o 0:d3873e73d99e init
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
203 () public
3620
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
204
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
205 Syncying every repo with the new state
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
206 --------------------------------------
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
207
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
208 $ hg push ../public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
209 pushing to ../public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
210 searching for changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
211 no changes found
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
212 2 new obsolescence markers
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
213 [1]
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
214 $ hg push ../private
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
215 pushing to ../private
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
216 searching for changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
217 no changes found
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
218 2 new obsolescence markers
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
219 [1]
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
220 $ hg push ../bob
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
221 pushing to ../bob
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
222 searching for changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
223 no changes found
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
224 2 new obsolescence markers
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
225 [1]
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
226
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
227 Creating more phase-divergence where a new resolution commit will be formed and
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
228 also testing bookmark movement
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
229 --------------------------------------------------------------------------------
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
230
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
231 Alice created a commit and push to private non-publishing repo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
232
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
233 $ echo foo > foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
234 $ hg add foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
235 $ hg ci -m "added foo to foo"
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
236 $ hg glog
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
237 @ 3:aa071e5554e3 added foo to foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
238 | () draft
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
239 o 1:4d1169d82e47 modify a
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
240 | () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
241 o 0:d3873e73d99e init
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
242 () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
243
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
244 $ hg push ../private
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
245 pushing to ../private
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
246 searching for changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
247 adding changesets
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
248 adding manifests
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
249 adding file changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
250 added 1 changesets with 1 changes to 1 files
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
251
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
252 Bob pulled from the private repo and pushed that to publishing repo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
253
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
254 $ cd ../bob
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
255 $ hg pull ../private
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
256 pulling from ../private
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
257 searching for changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
258 adding changesets
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
259 adding manifests
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
260 adding file changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
261 added 1 changesets with 1 changes to 1 files
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
262 new changesets aa071e5554e3
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
263 (run 'hg update' to get a working copy)
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
264
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
265 $ hg push ../public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
266 pushing to ../public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
267 searching for changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
268 adding changesets
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
269 adding manifests
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
270 adding file changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
271 added 1 changesets with 1 changes to 1 files
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
272
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
273 Alice amended that changeset and then pulled from publishing repo creating
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
274 phase-divergence
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
275
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
276 $ cd ../alice
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
277 $ echo bar >> foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
278 $ hg amend -m "added bar to foo"
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
279 $ hg bookmark bm
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
280
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
281 $ hg pull ../public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
282 pulling from ../public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
283 searching for changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
284 no changes found
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
285 1 new phase-divergent changesets
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
286
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
287 $ hg glog
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
288 @ 4:d47f2b37ed82 added bar to foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
289 | (bm) draft
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
290 | o 3:aa071e5554e3 added foo to foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
291 |/ () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
292 o 1:4d1169d82e47 modify a
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
293 | () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
294 o 0:d3873e73d99e init
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
295 () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
296
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
297 Resolving the new phase-divergence changeset using `hg evolve`
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
298 --------------------------------------------------------------
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
299
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
300 XXX: this should have popped up for a new commit message of the changeset or an
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
301 option should be there
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
302
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
303 XXX: we should document what should user expect where running this, writing this
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
304 test I have to go through code base to understand what will be the behavior
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
305
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
306 $ hg evolve --phase-divergent
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
307 recreate:[4] added bar to foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
308 atop:[3] added foo to foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
309 computing new diff
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
310 committed as 3d62500c673d
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
311 working directory is now at 3d62500c673d
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
312
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
313 $ hg exp
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
314 # HG changeset patch
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
315 # User test
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
316 # Date 0 0
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
317 # Thu Jan 01 00:00:00 1970 +0000
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
318 # Node ID 3d62500c673dd1c88bb09a73e86d0210aed6fcb6
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
319 # Parent aa071e5554e36080a36cfd24accd5a71e3320f1e
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
320 phase-divergent update to aa071e5554e3:
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
321
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
322 added bar to foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
323
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
324 diff -r aa071e5554e3 -r 3d62500c673d foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
325 --- a/foo Thu Jan 01 00:00:00 1970 +0000
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
326 +++ b/foo Thu Jan 01 00:00:00 1970 +0000
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
327 @@ -1,1 +1,2 @@
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
328 foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
329 +bar
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
330
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
331 XXX: the commit message is not best one, we should give option to user to modify
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
332 the commit message
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
333
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
334 $ hg glog
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
335 @ 5:3d62500c673d phase-divergent update to aa071e5554e3:
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
336 | (bm) draft
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
337 o 3:aa071e5554e3 added foo to foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
338 | () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
339 o 1:4d1169d82e47 modify a
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
340 | () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
341 o 0:d3873e73d99e init
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
342 () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
343
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
344 $ hg obslog -r . --all
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
345 @ 3d62500c673d (5) phase-divergent update to aa071e5554e3:
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
346 |
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
347 x d47f2b37ed82 (4) added bar to foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
348 | rewritten(description, parent, content) as 3d62500c673d using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
349 |
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
350 o aa071e5554e3 (3) added foo to foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
351 rewritten(description, content) as d47f2b37ed82 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
352
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
353
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
354 Syncing all other repositories
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
355 ------------------------------
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
356
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
357 These pushed should not be turned to quiet mode as the output is very helpful to
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
358 make sure everything is working fine
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
359
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
360 $ hg push ../bob
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
361 pushing to ../bob
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
362 searching for changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
363 adding changesets
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
364 adding manifests
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
365 adding file changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
366 added 1 changesets with 1 changes to 1 files
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
367 2 new obsolescence markers
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
368
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
369 $ hg push ../private
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
370 pushing to ../private
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
371 searching for changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
372 adding changesets
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
373 adding manifests
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
374 adding file changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
375 added 1 changesets with 1 changes to 1 files
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
376 2 new obsolescence markers
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
377
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
378 $ hg push ../public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
379 pushing to ../public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
380 searching for changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
381 adding changesets
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
382 adding manifests
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
383 adding file changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
384 added 1 changesets with 1 changes to 1 files
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
385 2 new obsolescence markers
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
386
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
387 Creating a phasedivergence changeset where the divergent changeset changed in a
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
388 way that we rebase that on old public changeset, there will be conflicts, but
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
389 the `hg evolve` command handles it very well and uses `hg revert` logic to
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
390 prevent any conflicts
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
391 -------------------------------------------------------------------------------
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
392
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
393 Alice creates one more changeset and pushes to private repo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
394
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
395 $ echo bar > bar
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
396 $ hg ci -Aqm "added bar to bar"
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
397 $ hg push ../private
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
398 pushing to ../private
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
399 searching for changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
400 adding changesets
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
401 adding manifests
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
402 adding file changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
403 added 1 changesets with 1 changes to 1 files
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
404
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
405 Bob pulls from private and pushes to public repo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
406 $ cd ../bob
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
407
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
408 $ hg pull ../private
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
409 pulling from ../private
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
410 searching for changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
411 adding changesets
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
412 adding manifests
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
413 adding file changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
414 added 1 changesets with 1 changes to 1 files
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
415 new changesets b756eb10ea73
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
416 (run 'hg update' to get a working copy)
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
417
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
418 $ hg push ../public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
419 pushing to ../public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
420 searching for changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
421 adding changesets
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
422 adding manifests
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
423 adding file changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
424 added 1 changesets with 1 changes to 1 files
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
425
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
426 Alice amends the changeset and then pull from public creating phase-divergence
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
427
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
428 $ cd ../alice
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
429 $ echo foo > bar
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
430 $ hg amend -m "foo to bar"
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
431
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
432 $ hg pull ../public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
433 pulling from ../public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
434 searching for changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
435 no changes found
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
436 1 new phase-divergent changesets
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
437
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
438 $ hg glog
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
439 @ 7:2c3560aedead foo to bar
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
440 | (bm) draft
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
441 | o 6:b756eb10ea73 added bar to bar
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
442 |/ () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
443 o 5:3d62500c673d phase-divergent update to aa071e5554e3:
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
444 | () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
445 o 3:aa071e5554e3 added foo to foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
446 | () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
447 o 1:4d1169d82e47 modify a
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
448 | () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
449 o 0:d3873e73d99e init
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
450 () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
451
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
452 Resolving the new phase-divergence changeset using `hg evolve`
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
453 ---------------------------------------------------------------
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
454
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
455 $ hg evolve --phase-divergent
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
456 recreate:[7] foo to bar
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
457 atop:[6] added bar to bar
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
458 computing new diff
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
459 committed as 502e73736632
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
460 working directory is now at 502e73736632
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
461
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
462 $ hg exp
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
463 # HG changeset patch
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
464 # User test
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
465 # Date 0 0
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
466 # Thu Jan 01 00:00:00 1970 +0000
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
467 # Node ID 502e737366322886cf628276aa0a2796904453b4
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
468 # Parent b756eb10ea73ee4ba69c998e64a5c6e1005d74b5
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
469 phase-divergent update to b756eb10ea73:
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
470
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
471 foo to bar
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
472
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
473 diff -r b756eb10ea73 -r 502e73736632 bar
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
474 --- a/bar Thu Jan 01 00:00:00 1970 +0000
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
475 +++ b/bar Thu Jan 01 00:00:00 1970 +0000
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
476 @@ -1,1 +1,1 @@
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
477 -bar
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
478 +foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
479
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
480 $ hg glog
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
481 @ 8:502e73736632 phase-divergent update to b756eb10ea73:
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
482 | (bm) draft
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
483 o 6:b756eb10ea73 added bar to bar
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
484 | () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
485 o 5:3d62500c673d phase-divergent update to aa071e5554e3:
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
486 | () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
487 o 3:aa071e5554e3 added foo to foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
488 | () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
489 o 1:4d1169d82e47 modify a
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
490 | () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
491 o 0:d3873e73d99e init
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
492 () public
3621
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
493
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
494 Syncing all the repositories
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
495 ----------------------------
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
496
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
497 $ hg push ../private
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
498 pushing to ../private
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
499 searching for changes
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
500 adding changesets
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
501 adding manifests
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
502 adding file changes
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
503 added 1 changesets with 1 changes to 1 files
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
504 2 new obsolescence markers
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
505 $ hg push ../public
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
506 pushing to ../public
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
507 searching for changes
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
508 adding changesets
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
509 adding manifests
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
510 adding file changes
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
511 added 1 changesets with 1 changes to 1 files
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
512 2 new obsolescence markers
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
513
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
514 Creating phase-divergence with divergent changeset and precursor having
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
515 different parents
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
516 -----------------------------------------------------------------------
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
517
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
518 Alice creates a changeset and pushes to private repo
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
519
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
520 $ echo x > x
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
521 $ hg ci -Am "added x to x"
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
522 adding x
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
523
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
524 $ hg push ../private
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
525 pushing to ../private
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
526 searching for changes
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
527 adding changesets
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
528 adding manifests
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
529 adding file changes
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
530 added 1 changesets with 1 changes to 1 files
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
531
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
532 Bob does what he always does, pull from private and push to public, he is acting
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
533 as a CI service
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
534
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
535 $ cd ../bob
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
536 $ hg pull ../private
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
537 pulling from ../private
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
538 searching for changes
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
539 adding changesets
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
540 adding manifests
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
541 adding file changes
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
542 added 2 changesets with 2 changes to 2 files
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
543 2 new obsolescence markers
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
544 new changesets 502e73736632:2352021b3785
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
545 (run 'hg update' to get a working copy)
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
546 $ hg push ../public
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
547 pushing to ../public
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
548 searching for changes
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
549 adding changesets
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
550 adding manifests
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
551 adding file changes
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
552 added 1 changesets with 1 changes to 1 files
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
553
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
554 Alice like always dont care about Bob existence and rebases her changeset and
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
555 then pull from public repo creating phase divergence
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
556
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
557 $ cd ../alice
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
558 $ hg rebase -r . -d .^^^
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
559 rebasing 9:2352021b3785 "added x to x" (bm tip)
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
560
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
561 $ hg pull ../public
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
562 pulling from ../public
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
563 searching for changes
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
564 no changes found
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
565 1 new phase-divergent changesets
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
566
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
567 $ hg obslog -r .
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
568 @ 334e300d6db5 (10) added x to x
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
569 |
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
570 o 2352021b3785 (9) added x to x
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
571 rewritten(parent) as 334e300d6db5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
572
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
573 $ hg glog -r .^::
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
574 @ 10:334e300d6db5 added x to x
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
575 | (bm) draft
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
576 | o 9:2352021b3785 added x to x
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
577 | | () public
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
578 | o 8:502e73736632 phase-divergent update to b756eb10ea73:
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
579 | | () public
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
580 | o 6:b756eb10ea73 added bar to bar
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
581 |/ () public
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
582 o 5:3d62500c673d phase-divergent update to aa071e5554e3:
3625
7e253bbac9a1 tests: show first line of commit message in test-evolve-phase-divergence.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3624
diff changeset
583 | () public
7e253bbac9a1 tests: show first line of commit message in test-evolve-phase-divergence.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3624
diff changeset
584 ~
3621
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
585
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
586 Using `hg evolve` to resolve phase-divergence
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
587 ---------------------------------------------
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
588
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
589 $ hg evolve --phase-divergent
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
590 recreate:[10] added x to x
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
591 atop:[9] added x to x
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
592 rebasing to destination parent: 502e73736632
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
593 (leaving bookmark bm)
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
594 computing new diff
3623
71fbb679e311 evolve: use the new rebased changeset to resolve phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3621
diff changeset
595 committed as 2352021b3785
71fbb679e311 evolve: use the new rebased changeset to resolve phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3621
diff changeset
596 working directory is now at 2352021b3785
3621
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
597
3623
71fbb679e311 evolve: use the new rebased changeset to resolve phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3621
diff changeset
598 XXX: we should move bookmark here
3621
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
599 $ hg glog
3624
6756f2a85f5b evolve: make sure bookmarks are moved after phase-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3623
diff changeset
600 @ 9:2352021b3785 added x to x
6756f2a85f5b evolve: make sure bookmarks are moved after phase-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3623
diff changeset
601 | (bm) public
3621
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
602 o 8:502e73736632 phase-divergent update to b756eb10ea73:
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
603 | () public
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
604 o 6:b756eb10ea73 added bar to bar
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
605 | () public
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
606 o 5:3d62500c673d phase-divergent update to aa071e5554e3:
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
607 | () public
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
608 o 3:aa071e5554e3 added foo to foo
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
609 | () public
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
610 o 1:4d1169d82e47 modify a
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
611 | () public
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
612 o 0:d3873e73d99e init
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
613 () public
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
614
3623
71fbb679e311 evolve: use the new rebased changeset to resolve phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3621
diff changeset
615 $ hg obslog -r . b1a0e143e32b --all --hidden
3621
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
616 x b1a0e143e32b (11) added x to x
3623
71fbb679e311 evolve: use the new rebased changeset to resolve phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3621
diff changeset
617 | pruned using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
3621
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
618 |
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
619 x 334e300d6db5 (10) added x to x
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
620 | rewritten(parent) as b1a0e143e32b using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
621 |
3623
71fbb679e311 evolve: use the new rebased changeset to resolve phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3621
diff changeset
622 @ 2352021b3785 (9) added x to x
3621
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
623 rewritten(parent) as 334e300d6db5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
624
3623
71fbb679e311 evolve: use the new rebased changeset to resolve phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3621
diff changeset
625
3621
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
626 $ hg exp
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
627 # HG changeset patch
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
628 # User test
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
629 # Date 0 0
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
630 # Thu Jan 01 00:00:00 1970 +0000
3623
71fbb679e311 evolve: use the new rebased changeset to resolve phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3621
diff changeset
631 # Node ID 2352021b37851be226ebed109b0eb6eada918566
71fbb679e311 evolve: use the new rebased changeset to resolve phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3621
diff changeset
632 # Parent 502e737366322886cf628276aa0a2796904453b4
3621
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
633 added x to x
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
634
3623
71fbb679e311 evolve: use the new rebased changeset to resolve phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3621
diff changeset
635 diff -r 502e73736632 -r 2352021b3785 x
71fbb679e311 evolve: use the new rebased changeset to resolve phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3621
diff changeset
636 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
71fbb679e311 evolve: use the new rebased changeset to resolve phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3621
diff changeset
637 +++ b/x Thu Jan 01 00:00:00 1970 +0000
71fbb679e311 evolve: use the new rebased changeset to resolve phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3621
diff changeset
638 @@ -0,0 +1,1 @@
71fbb679e311 evolve: use the new rebased changeset to resolve phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3621
diff changeset
639 +x
3626
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
640
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
641 Creating divergence with parent and content change both but not resulting in
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
642 conflicts
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
643 -----------------------------------------------------------------------------
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
644
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
645 Alice is tired of pushing and pulling and will create phase-divergence locally
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
646
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
647 $ hg glog
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
648 @ 9:2352021b3785 added x to x
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
649 | (bm) public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
650 o 8:502e73736632 phase-divergent update to b756eb10ea73:
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
651 | () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
652 o 6:b756eb10ea73 added bar to bar
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
653 | () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
654 o 5:3d62500c673d phase-divergent update to aa071e5554e3:
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
655 | () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
656 o 3:aa071e5554e3 added foo to foo
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
657 | () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
658 o 1:4d1169d82e47 modify a
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
659 | () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
660 o 0:d3873e73d99e init
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
661 () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
662
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
663 $ echo y > y
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
664 $ echo foobar >> foo
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
665 $ hg add y
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
666 $ hg ci -m "y to y and foobar to foo"
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
667 $ hg rebase -r . -d .^^^
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
668 rebasing 12:dc88f5aa9bc9 "y to y and foobar to foo" (tip)
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
669
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
670 $ echo foo > y
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
671 $ hg amend
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
672
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
673 Alice making the old changeset public to have content-divergence
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
674
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
675 $ hg phase -r dc88f5aa9bc9 --public --hidden
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
676 1 new phase-divergent changesets
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
677 $ hg glog
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
678 @ 14:13015a180eee y to y and foobar to foo
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
679 | () draft
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
680 | o 12:dc88f5aa9bc9 y to y and foobar to foo
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
681 | | () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
682 | o 9:2352021b3785 added x to x
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
683 | | (bm) public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
684 | o 8:502e73736632 phase-divergent update to b756eb10ea73:
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
685 |/ () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
686 o 6:b756eb10ea73 added bar to bar
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
687 | () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
688 o 5:3d62500c673d phase-divergent update to aa071e5554e3:
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
689 | () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
690 o 3:aa071e5554e3 added foo to foo
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
691 | () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
692 o 1:4d1169d82e47 modify a
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
693 | () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
694 o 0:d3873e73d99e init
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
695 () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
696
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
697 $ hg obslog -r .
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
698 @ 13015a180eee (14) y to y and foobar to foo
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
699 |
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
700 x 211ab84d1689 (13) y to y and foobar to foo
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
701 | rewritten(content) as 13015a180eee using amend by test (Thu Jan 01 00:00:00 1970 +0000)
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
702 |
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
703 o dc88f5aa9bc9 (12) y to y and foobar to foo
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
704 rewritten(parent) as 211ab84d1689 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
705
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
706 Resolving divergence using `hg evolve`
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
707 -------------------------------------
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
708
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
709 $ hg evolve --phase-divergent
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
710 recreate:[14] y to y and foobar to foo
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
711 atop:[12] y to y and foobar to foo
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
712 rebasing to destination parent: 2352021b3785
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
713 computing new diff
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
714 committed as 8c2bb6fb44e9
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
715 working directory is now at 8c2bb6fb44e9
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
716
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
717 $ hg exp
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
718 # HG changeset patch
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
719 # User test
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
720 # Date 0 0
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
721 # Thu Jan 01 00:00:00 1970 +0000
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
722 # Node ID 8c2bb6fb44e9443c64b3a2a3d061272c8e25e6ce
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
723 # Parent dc88f5aa9bc90a6418899d267d9524205dfb429b
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
724 phase-divergent update to dc88f5aa9bc9:
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
725
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
726 y to y and foobar to foo
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
727
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
728 diff -r dc88f5aa9bc9 -r 8c2bb6fb44e9 y
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
729 --- a/y Thu Jan 01 00:00:00 1970 +0000
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
730 +++ b/y Thu Jan 01 00:00:00 1970 +0000
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
731 @@ -1,1 +1,1 @@
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
732 -y
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
733 +foo
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
734
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
735 $ hg glog
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
736 @ 16:8c2bb6fb44e9 phase-divergent update to dc88f5aa9bc9:
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
737 | () draft
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
738 o 12:dc88f5aa9bc9 y to y and foobar to foo
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
739 | () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
740 o 9:2352021b3785 added x to x
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
741 | (bm) public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
742 o 8:502e73736632 phase-divergent update to b756eb10ea73:
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
743 | () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
744 o 6:b756eb10ea73 added bar to bar
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
745 | () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
746 o 5:3d62500c673d phase-divergent update to aa071e5554e3:
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
747 | () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
748 o 3:aa071e5554e3 added foo to foo
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
749 | () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
750 o 1:4d1169d82e47 modify a
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
751 | () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
752 o 0:d3873e73d99e init
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
753 () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
754
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
755 Creating divergence with parent and content change both which results in
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
756 conflicts while rebasing on parent
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
757 -----------------------------------------------------------------------------
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
758
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
759 $ echo l > l
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
760 $ hg ci -Aqm "added l to l"
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
761 $ hg rebase -r . -d .^^^^
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
762 rebasing 17:f3794e5a91dc "added l to l" (tip)
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
763 $ echo kl > l
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
764 $ echo foo > x
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
765 $ hg add x
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
766 $ hg amend
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
767
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
768 $ hg obslog -r .
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
769 @ 5fd38c0de46e (19) added l to l
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
770 |
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
771 x 2bfd56949cf0 (18) added l to l
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
772 | rewritten(content) as 5fd38c0de46e using amend by test (Thu Jan 01 00:00:00 1970 +0000)
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
773 |
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
774 x f3794e5a91dc (17) added l to l
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
775 rewritten(parent) as 2bfd56949cf0 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
776
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
777
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
778 $ hg phase -r f3794e5a91dc --public --hidden
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
779 1 new phase-divergent changesets
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
780
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
781 Resolution using `hg evolve --phase-divergent`
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
782 ----------------------------------------------
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
783
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
784 $ hg evolve --phase-divergent
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
785 recreate:[19] added l to l
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
786 atop:[17] added l to l
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
787 rebasing to destination parent: 8c2bb6fb44e9
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
788 merging x
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
789 warning: conflicts while merging x! (edit, then use 'hg resolve --mark')
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
790 evolution failed!
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
791 fix conflict and run 'hg evolve --continue'
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
792 abort: unresolved merge conflicts (see hg help resolve)
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
793 [255]
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
794
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
795 $ hg diff
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
796 diff -r 8c2bb6fb44e9 l
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
797 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
798 +++ b/l Thu Jan 01 00:00:00 1970 +0000
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
799 @@ -0,0 +1,1 @@
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
800 +kl
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
801 diff -r 8c2bb6fb44e9 x
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
802 --- a/x Thu Jan 01 00:00:00 1970 +0000
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
803 +++ b/x Thu Jan 01 00:00:00 1970 +0000
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
804 @@ -1,1 +1,5 @@
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
805 +<<<<<<< destination: 8c2bb6fb44e9 - test: phase-divergent update to dc88f5aa9...
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
806 x
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
807 +=======
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
808 +foo
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
809 +>>>>>>> evolving: 5fd38c0de46e - test: added l to l
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
810
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
811 $ echo foo > x
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
812
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
813 $ hg resolve -m
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
814 (no more unresolved files)
3628
170b99a9c0b4 evolve: write data to evolvestate in case on conflicts in phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3626
diff changeset
815 continue: hg evolve --continue
170b99a9c0b4 evolve: write data to evolvestate in case on conflicts in phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3626
diff changeset
816
170b99a9c0b4 evolve: write data to evolvestate in case on conflicts in phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3626
diff changeset
817 XXX: we should handle this correctly here, this is not phase-divergence
170b99a9c0b4 evolve: write data to evolvestate in case on conflicts in phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3626
diff changeset
818 resolution happening
170b99a9c0b4 evolve: write data to evolvestate in case on conflicts in phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3626
diff changeset
819
170b99a9c0b4 evolve: write data to evolvestate in case on conflicts in phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3626
diff changeset
820 $ hg evolve --continue
3629
f23946bf6625 evolve: move logic to complete interrupted orphan resolution to new fn
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3628
diff changeset
821 continuing interrupted 'phasedivergent' resolution is not yet supported
f23946bf6625 evolve: move logic to complete interrupted orphan resolution to new fn
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3628
diff changeset
822 working directory is now at 8c2bb6fb44e9
3626
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
823
3628
170b99a9c0b4 evolve: write data to evolvestate in case on conflicts in phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3626
diff changeset
824 $ hg glog
3629
f23946bf6625 evolve: move logic to complete interrupted orphan resolution to new fn
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3628
diff changeset
825 * 19:5fd38c0de46e added l to l
3628
170b99a9c0b4 evolve: write data to evolvestate in case on conflicts in phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3626
diff changeset
826 | () draft
170b99a9c0b4 evolve: write data to evolvestate in case on conflicts in phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3626
diff changeset
827 | o 17:f3794e5a91dc added l to l
3629
f23946bf6625 evolve: move logic to complete interrupted orphan resolution to new fn
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3628
diff changeset
828 | | () public
f23946bf6625 evolve: move logic to complete interrupted orphan resolution to new fn
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3628
diff changeset
829 | @ 16:8c2bb6fb44e9 phase-divergent update to dc88f5aa9bc9:
f23946bf6625 evolve: move logic to complete interrupted orphan resolution to new fn
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3628
diff changeset
830 | | () public
f23946bf6625 evolve: move logic to complete interrupted orphan resolution to new fn
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3628
diff changeset
831 | o 12:dc88f5aa9bc9 y to y and foobar to foo
f23946bf6625 evolve: move logic to complete interrupted orphan resolution to new fn
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3628
diff changeset
832 | | () public
f23946bf6625 evolve: move logic to complete interrupted orphan resolution to new fn
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3628
diff changeset
833 | o 9:2352021b3785 added x to x
f23946bf6625 evolve: move logic to complete interrupted orphan resolution to new fn
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3628
diff changeset
834 |/ (bm) public
3628
170b99a9c0b4 evolve: write data to evolvestate in case on conflicts in phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3626
diff changeset
835 o 8:502e73736632 phase-divergent update to b756eb10ea73:
170b99a9c0b4 evolve: write data to evolvestate in case on conflicts in phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3626
diff changeset
836 | () public
170b99a9c0b4 evolve: write data to evolvestate in case on conflicts in phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3626
diff changeset
837 o 6:b756eb10ea73 added bar to bar
170b99a9c0b4 evolve: write data to evolvestate in case on conflicts in phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3626
diff changeset
838 | () public
170b99a9c0b4 evolve: write data to evolvestate in case on conflicts in phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3626
diff changeset
839 o 5:3d62500c673d phase-divergent update to aa071e5554e3:
170b99a9c0b4 evolve: write data to evolvestate in case on conflicts in phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3626
diff changeset
840 | () public
170b99a9c0b4 evolve: write data to evolvestate in case on conflicts in phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3626
diff changeset
841 o 3:aa071e5554e3 added foo to foo
170b99a9c0b4 evolve: write data to evolvestate in case on conflicts in phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3626
diff changeset
842 | () public
170b99a9c0b4 evolve: write data to evolvestate in case on conflicts in phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3626
diff changeset
843 o 1:4d1169d82e47 modify a
170b99a9c0b4 evolve: write data to evolvestate in case on conflicts in phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3626
diff changeset
844 | () public
170b99a9c0b4 evolve: write data to evolvestate in case on conflicts in phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3626
diff changeset
845 o 0:d3873e73d99e init
170b99a9c0b4 evolve: write data to evolvestate in case on conflicts in phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3626
diff changeset
846 () public