author | Pierre-Yves David <pierre-yves.david@octobus.net> |
Fri, 29 Mar 2019 11:48:36 +0100 | |
changeset 4465 | 6feeaf00db44 |
parent 4457 | 218fa7c1fe4b |
child 4489 | 818e8190e867 |
permissions | -rw-r--r-- |
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 |
|
4448
ab5bc57ba897
tests: create "private" repository in already-updated state
Martin von Zweigbergk <martinvonz@google.com>
parents:
4340
diff
changeset
|
31 |
$ hg clone public private |
ab5bc57ba897
tests: create "private" repository in already-updated state
Martin von Zweigbergk <martinvonz@google.com>
parents:
4340
diff
changeset
|
32 |
updating to branch default |
ab5bc57ba897
tests: create "private" repository in already-updated state
Martin von Zweigbergk <martinvonz@google.com>
parents:
4340
diff
changeset
|
33 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1150
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
34 |
$ cd private |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
35 |
$ 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
|
36 |
> [extensions] |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
37 |
> evolve = $evolvepath |
1416
b8a9d2e8c772
test-evolve-bumped: improve tests legibility
Laurent Charignon <lcharignon@fb.com>
parents:
1404
diff
changeset
|
38 |
> [ui] |
b8a9d2e8c772
test-evolve-bumped: improve tests legibility
Laurent Charignon <lcharignon@fb.com>
parents:
1404
diff
changeset
|
39 |
> 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
|
40 |
> [phases] |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
41 |
> publish = false |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
42 |
> EOF |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
43 |
$ cd .. |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
44 |
|
3617
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
45 |
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
|
46 |
--------------------------------------------------- |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
47 |
|
1150
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
48 |
$ 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
|
49 |
$ cp -a private bob |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
50 |
$ cp -a private split |
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
51 |
$ cp -a private split-across-branches |
4456
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
52 |
$ cp -a private split-and-amend |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
53 |
$ cp -a private merge-no-conflict |
1150
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
54 |
|
3617
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
55 |
Creating a phase-divergence changeset |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
56 |
------------------------------------- |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
57 |
|
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
58 |
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
|
59 |
|
1150
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
60 |
$ cd alice |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
61 |
$ echo a >> a |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
62 |
$ 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
|
63 |
$ hg push ../private |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
64 |
pushing to ../private |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
65 |
searching for changes |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
66 |
adding changesets |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
67 |
adding manifests |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
68 |
adding file changes |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
69 |
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
|
70 |
$ hg glog |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
71 |
@ 1:4d1169d82e47 modify a |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
72 |
| () draft |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
73 |
o 0:d3873e73d99e init |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
74 |
() public |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
75 |
|
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
76 |
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
|
77 |
changeset public |
1150
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
78 |
|
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
79 |
$ cd ../bob |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
80 |
$ hg pull ../private |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
81 |
pulling from ../private |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
82 |
searching for changes |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
83 |
adding changesets |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
84 |
adding manifests |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
85 |
adding file changes |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
86 |
added 1 changesets with 1 changes to 1 files |
4181
ab3581bc0637
branching: preserve the expected output on default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4165
diff
changeset
|
87 |
new changesets 4d1169d82e47 (1 drafts) |
1150
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
88 |
(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
|
89 |
|
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
90 |
$ hg glog |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
91 |
o 1:4d1169d82e47 modify a |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
92 |
| () draft |
4448
ab5bc57ba897
tests: create "private" repository in already-updated state
Martin von Zweigbergk <martinvonz@google.com>
parents:
4340
diff
changeset
|
93 |
@ 0:d3873e73d99e init |
3617
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
94 |
() public |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
95 |
|
1150
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
96 |
$ hg push ../public |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
97 |
pushing to ../public |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
98 |
searching for changes |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
99 |
adding changesets |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
100 |
adding manifests |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
101 |
adding file changes |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
102 |
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
|
103 |
|
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
104 |
$ hg glog |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
105 |
o 1:4d1169d82e47 modify a |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
106 |
| () public |
4448
ab5bc57ba897
tests: create "private" repository in already-updated state
Martin von Zweigbergk <martinvonz@google.com>
parents:
4340
diff
changeset
|
107 |
@ 0:d3873e73d99e init |
3617
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
108 |
() public |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
109 |
|
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
110 |
*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
|
111 |
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
|
112 |
|
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
113 |
$ cd ../alice |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
114 |
$ hg amend -m 'tweak a' |
3618
2d8e39919742
tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3617
diff
changeset
|
115 |
|
2d8e39919742
tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3617
diff
changeset
|
116 |
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
|
117 |
$ hg pull ../public |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
118 |
pulling from ../public |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
119 |
searching for changes |
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
120 |
no changes found |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
121 |
1 new phase-divergent changesets |
3837
dda5b2134b32
tests: update tests output with changes in d0abd7949ea3 in core hg
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3786
diff
changeset
|
122 |
1 local changesets published |
1150
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
123 |
|
3617
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
124 |
$ hg glog |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
125 |
@ 2:98bb3a6cfe1a tweak a |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
126 |
| () draft |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
127 |
| o 1:4d1169d82e47 modify a |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
128 |
|/ () public |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
129 |
o 0:d3873e73d99e init |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
130 |
() public |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
131 |
|
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
132 |
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
|
133 |
------------------------------------------------------ |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
134 |
|
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
135 |
$ hg evolve --list |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
136 |
98bb3a6cfe1a: tweak a |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
137 |
phase-divergent: 4d1169d82e47 (immutable precursor) |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
138 |
|
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
139 |
|
3618
2d8e39919742
tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3617
diff
changeset
|
140 |
|
2d8e39919742
tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3617
diff
changeset
|
141 |
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
|
142 |
|
3618
2d8e39919742
tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3617
diff
changeset
|
143 |
XXX-Pulkit: this is not helpful |
2d8e39919742
tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3617
diff
changeset
|
144 |
|
2d8e39919742
tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3617
diff
changeset
|
145 |
XXX-Marmoute: public changeset "instable themself" |
2d8e39919742
tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3617
diff
changeset
|
146 |
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
|
147 |
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
|
148 |
$ hg evolve -r 4d1169d8 --list |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
149 |
4d1169d82e47: modify a |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
150 |
|
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
151 |
|
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
152 |
Understanding phasedivergence using obslog |
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 |
|
3618
2d8e39919742
tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3617
diff
changeset
|
155 |
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
|
156 |
$ hg obslog -r . --all |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
157 |
@ 98bb3a6cfe1a (2) tweak a |
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 |
o 4d1169d82e47 (1) modify a |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
160 |
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
|
161 |
|
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
162 |
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
|
163 |
-------------------------------------------------- |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
164 |
|
3618
2d8e39919742
tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3617
diff
changeset
|
165 |
(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
|
166 |
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
|
167 |
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
|
168 |
|
3617
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
169 |
$ hg evolve |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
170 |
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
|
171 |
(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
|
172 |
[2] |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
173 |
|
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
174 |
testing the --confirm option |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
175 |
$ hg evolve --phase-divergent --confirm <<EOF |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
176 |
> n |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
177 |
> EOF |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
178 |
recreate:[2] tweak a |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
179 |
atop:[1] modify a |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
180 |
perform evolve? [Ny] n |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
181 |
abort: evolve aborted by user |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
182 |
[255] |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
183 |
|
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
184 |
testing the --dry-run option |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
185 |
|
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
186 |
$ hg evolve --phase-divergent --dry-run |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
187 |
recreate:[2] tweak a |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
188 |
atop:[1] modify a |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
189 |
hg rebase --rev 98bb3a6cfe1a --dest d3873e73d99e; |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
190 |
hg update 4d1169d82e47; |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
191 |
hg revert --all --rev 98bb3a6cfe1a; |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
192 |
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
|
193 |
|
3618
2d8e39919742
tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3617
diff
changeset
|
194 |
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
|
195 |
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
|
196 |
|
3617
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
197 |
$ 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
|
198 |
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
|
199 |
atop:[1] modify a |
4453
700b8b3a5a54
evolve: clarify output when phase-divergence resolution results in no change
Martin von Zweigbergk <martinvonz@google.com>
parents:
4452
diff
changeset
|
200 |
no changes to commit |
1150
2c99d92faa62
evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
201 |
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
|
202 |
|
3617
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
203 |
$ hg glog |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
204 |
@ 1:4d1169d82e47 modify a |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
205 |
| () public |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
206 |
o 0:d3873e73d99e init |
a0e322641810
tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3610
diff
changeset
|
207 |
() public |
3620
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
208 |
|
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
209 |
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
|
210 |
-------------------------------------- |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
211 |
|
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
212 |
$ 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
|
213 |
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
|
214 |
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
|
215 |
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
|
216 |
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
|
217 |
[1] |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
218 |
$ 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
|
219 |
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
|
220 |
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
|
221 |
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
|
222 |
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
|
223 |
[1] |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
224 |
$ 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
|
225 |
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
|
226 |
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
|
227 |
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
|
228 |
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
|
229 |
[1] |
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 |
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
|
232 |
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
|
233 |
-------------------------------------------------------------------------------- |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
234 |
|
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
235 |
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
|
236 |
|
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
237 |
$ 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
|
238 |
$ 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
|
239 |
$ 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
|
240 |
$ hg glog |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
241 |
@ 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
|
242 |
| () draft |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
243 |
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
|
244 |
| () public |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
245 |
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
|
246 |
() public |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
247 |
|
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
248 |
$ 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
|
249 |
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
|
250 |
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
|
251 |
adding changesets |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
252 |
adding manifests |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
253 |
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
|
254 |
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
|
255 |
|
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
256 |
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
|
257 |
|
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
258 |
$ cd ../bob |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
259 |
$ 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
|
260 |
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
|
261 |
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
|
262 |
adding changesets |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
263 |
adding manifests |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
264 |
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
|
265 |
added 1 changesets with 1 changes to 1 files |
4181
ab3581bc0637
branching: preserve the expected output on default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4165
diff
changeset
|
266 |
new changesets aa071e5554e3 (1 drafts) |
3620
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
267 |
(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
|
268 |
|
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
269 |
$ 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
|
270 |
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
|
271 |
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
|
272 |
adding changesets |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
273 |
adding manifests |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
274 |
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
|
275 |
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
|
276 |
|
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
277 |
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
|
278 |
phase-divergence |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
279 |
|
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
280 |
$ cd ../alice |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
281 |
$ 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
|
282 |
$ 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
|
283 |
$ 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
|
284 |
|
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
285 |
$ 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
|
286 |
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
|
287 |
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
|
288 |
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
|
289 |
1 new phase-divergent changesets |
3837
dda5b2134b32
tests: update tests output with changes in d0abd7949ea3 in core hg
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3786
diff
changeset
|
290 |
1 local changesets published |
3620
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
291 |
|
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
292 |
$ hg glog |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
293 |
@ 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
|
294 |
| (bm) draft |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
295 |
| 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
|
296 |
|/ () public |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
297 |
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
|
298 |
| () public |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
299 |
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
|
300 |
() public |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
301 |
|
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
302 |
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
|
303 |
-------------------------------------------------------------- |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
304 |
|
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
305 |
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
|
306 |
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
|
307 |
|
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
308 |
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
|
309 |
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
|
310 |
|
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
311 |
$ 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
|
312 |
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
|
313 |
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
|
314 |
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
|
315 |
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
|
316 |
|
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
317 |
$ hg exp |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
318 |
# 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
|
319 |
# User test |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
320 |
# 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
|
321 |
# 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
|
322 |
# 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
|
323 |
# Parent aa071e5554e36080a36cfd24accd5a71e3320f1e |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
324 |
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
|
325 |
|
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
326 |
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
|
327 |
|
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
328 |
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
|
329 |
--- 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
|
330 |
+++ 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
|
331 |
@@ -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
|
332 |
foo |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
333 |
+bar |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
334 |
|
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
335 |
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
|
336 |
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
|
337 |
|
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
338 |
$ hg glog |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
339 |
@ 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
|
340 |
| (bm) draft |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
341 |
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
|
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 |
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
|
344 |
| () public |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
345 |
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
|
346 |
() public |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
347 |
|
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
348 |
$ 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
|
349 |
@ 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
|
350 |
| |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
351 |
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
|
352 |
| 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
|
353 |
| |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
354 |
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
|
355 |
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
|
356 |
|
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
357 |
|
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
358 |
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
|
359 |
------------------------------ |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
360 |
|
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
361 |
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
|
362 |
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
|
363 |
|
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
364 |
$ 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
|
365 |
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
|
366 |
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
|
367 |
adding changesets |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
368 |
adding manifests |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
369 |
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
|
370 |
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
|
371 |
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
|
372 |
|
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
373 |
$ 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
|
374 |
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
|
375 |
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
|
376 |
adding changesets |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
377 |
adding manifests |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
378 |
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
|
379 |
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
|
380 |
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
|
381 |
|
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
382 |
$ 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
|
383 |
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
|
384 |
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
|
385 |
adding changesets |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
386 |
adding manifests |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
387 |
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
|
388 |
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
|
389 |
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
|
390 |
|
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
391 |
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
|
392 |
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
|
393 |
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
|
394 |
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
|
395 |
------------------------------------------------------------------------------- |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
396 |
|
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
397 |
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
|
398 |
|
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
399 |
$ 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
|
400 |
$ 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
|
401 |
$ 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
|
402 |
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
|
403 |
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
|
404 |
adding changesets |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
405 |
adding manifests |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
406 |
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
|
407 |
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
|
408 |
|
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
409 |
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
|
410 |
$ cd ../bob |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
411 |
|
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
412 |
$ 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
|
413 |
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
|
414 |
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
|
415 |
adding changesets |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
416 |
adding manifests |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
417 |
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
|
418 |
added 1 changesets with 1 changes to 1 files |
4181
ab3581bc0637
branching: preserve the expected output on default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4165
diff
changeset
|
419 |
new changesets b756eb10ea73 (1 drafts) |
3837
dda5b2134b32
tests: update tests output with changes in d0abd7949ea3 in core hg
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3786
diff
changeset
|
420 |
1 local changesets published |
3620
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
421 |
(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
|
422 |
|
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
423 |
$ 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
|
424 |
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
|
425 |
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
|
426 |
adding changesets |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
427 |
adding manifests |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
428 |
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
|
429 |
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
|
430 |
|
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
431 |
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
|
432 |
|
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
433 |
$ cd ../alice |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
434 |
$ 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
|
435 |
$ 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
|
436 |
|
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
437 |
$ 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
|
438 |
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
|
439 |
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
|
440 |
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
|
441 |
1 new phase-divergent changesets |
3837
dda5b2134b32
tests: update tests output with changes in d0abd7949ea3 in core hg
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3786
diff
changeset
|
442 |
1 local changesets published |
3620
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
443 |
|
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
444 |
$ hg glog |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
445 |
@ 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
|
446 |
| (bm) draft |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
447 |
| 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
|
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 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
|
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 |
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
|
452 |
| () public |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
453 |
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
|
454 |
| () public |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
455 |
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
|
456 |
() public |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
457 |
|
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
458 |
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
|
459 |
--------------------------------------------------------------- |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
460 |
|
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
461 |
$ 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
|
462 |
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
|
463 |
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
|
464 |
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
|
465 |
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
|
466 |
|
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
467 |
$ hg exp |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
468 |
# 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
|
469 |
# User test |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
470 |
# 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
|
471 |
# 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
|
472 |
# 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
|
473 |
# Parent b756eb10ea73ee4ba69c998e64a5c6e1005d74b5 |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
474 |
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
|
475 |
|
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
476 |
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
|
477 |
|
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
478 |
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
|
479 |
--- 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
|
480 |
+++ 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
|
481 |
@@ -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
|
482 |
-bar |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
483 |
+foo |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
484 |
|
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
485 |
$ hg glog |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
486 |
@ 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
|
487 |
| (bm) draft |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
488 |
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
|
489 |
| () public |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
490 |
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
|
491 |
| () public |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
492 |
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
|
493 |
| () public |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
494 |
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
|
495 |
| () public |
1f020455f6fe
tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3619
diff
changeset
|
496 |
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
|
497 |
() 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
|
498 |
|
db3ec5f79ab9
tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3620
diff
changeset
|
499 |
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
|
500 |
---------------------------- |
db3ec5f79ab9
tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3620
diff
changeset
|
501 |
|
db3ec5f79ab9
tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3620
diff
changeset
|
502 |
$ 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
|
503 |
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
|
504 |
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
|
505 |
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
|
506 |
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
|
507 |
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
|
508 |
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
|
509 |
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
|
510 |
$ 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
|
511 |
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
|
512 |
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
|
513 |
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
|
514 |
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
|
515 |
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
|
516 |
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
|
517 |
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
|
518 |
|
db3ec5f79ab9
tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3620
diff
changeset
|
519 |
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
|
520 |
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
|
521 |
----------------------------------------------------------------------- |
db3ec5f79ab9
tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3620
diff
changeset
|
522 |
|
db3ec5f79ab9
tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3620
diff
changeset
|
523 |
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
|
524 |
|
db3ec5f79ab9
tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3620
diff
changeset
|
525 |
$ 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
|
526 |
$ 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
|
527 |
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
|
528 |
|
db3ec5f79ab9
tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3620
diff
changeset
|
529 |
$ 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
|
530 |
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
|
531 |
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
|
532 |
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
|
533 |
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
|
534 |
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
|
535 |
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
|
536 |
|
db3ec5f79ab9
tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3620
diff
changeset
|
537 |
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
|
538 |
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
|
539 |
|
db3ec5f79ab9
tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3620
diff
changeset
|
540 |
$ 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
|
541 |
$ 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
|
542 |
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
|
543 |
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
|
544 |
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
|
545 |
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
|
546 |
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
|
547 |
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
|
548 |
2 new obsolescence markers |
4181
ab3581bc0637
branching: preserve the expected output on default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4165
diff
changeset
|
549 |
new changesets 502e73736632:2352021b3785 (1 drafts) |
3621
db3ec5f79ab9
tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3620
diff
changeset
|
550 |
(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
|
551 |
$ 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
|
552 |
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
|
553 |
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
|
554 |
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
|
555 |
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
|
556 |
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
|
557 |
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
|
558 |
|
db3ec5f79ab9
tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3620
diff
changeset
|
559 |
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
|
560 |
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
|
561 |
|
db3ec5f79ab9
tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3620
diff
changeset
|
562 |
$ 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
|
563 |
$ 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
|
564 |
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
|
565 |
|
db3ec5f79ab9
tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3620
diff
changeset
|
566 |
$ 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
|
567 |
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
|
568 |
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
|
569 |
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
|
570 |
1 new phase-divergent changesets |
3837
dda5b2134b32
tests: update tests output with changes in d0abd7949ea3 in core hg
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3786
diff
changeset
|
571 |
1 local changesets published |
3621
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 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
|
574 |
@ 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
|
575 |
| |
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 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
|
577 |
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
|
578 |
|
db3ec5f79ab9
tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3620
diff
changeset
|
579 |
$ 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
|
580 |
@ 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
|
581 |
| (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
|
582 |
| 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
|
583 |
| | () public |
db3ec5f79ab9
tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3620
diff
changeset
|
584 |
| 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
|
585 |
| | () public |
db3ec5f79ab9
tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3620
diff
changeset
|
586 |
| 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
|
587 |
|/ () public |
db3ec5f79ab9
tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3620
diff
changeset
|
588 |
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
|
589 |
| () public |
7e253bbac9a1
tests: show first line of commit message in test-evolve-phase-divergence.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3624
diff
changeset
|
590 |
~ |
3621
db3ec5f79ab9
tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3620
diff
changeset
|
591 |
|
db3ec5f79ab9
tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3620
diff
changeset
|
592 |
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
|
593 |
--------------------------------------------- |
db3ec5f79ab9
tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3620
diff
changeset
|
594 |
|
db3ec5f79ab9
tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3620
diff
changeset
|
595 |
$ 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
|
596 |
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
|
597 |
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
|
598 |
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
|
599 |
(leaving bookmark bm) |
4453
700b8b3a5a54
evolve: clarify output when phase-divergence resolution results in no change
Martin von Zweigbergk <martinvonz@google.com>
parents:
4452
diff
changeset
|
600 |
no changes to commit |
3623
71fbb679e311
evolve: use the new rebased changeset to resolve phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3621
diff
changeset
|
601 |
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
|
602 |
|
3623
71fbb679e311
evolve: use the new rebased changeset to resolve phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3621
diff
changeset
|
603 |
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
|
604 |
$ hg glog |
3624
6756f2a85f5b
evolve: make sure bookmarks are moved after phase-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3623
diff
changeset
|
605 |
@ 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
|
606 |
| (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
|
607 |
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
|
608 |
| () public |
db3ec5f79ab9
tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3620
diff
changeset
|
609 |
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
|
610 |
| () public |
db3ec5f79ab9
tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3620
diff
changeset
|
611 |
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
|
612 |
| () public |
db3ec5f79ab9
tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3620
diff
changeset
|
613 |
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
|
614 |
| () public |
db3ec5f79ab9
tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3620
diff
changeset
|
615 |
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
|
616 |
| () public |
db3ec5f79ab9
tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3620
diff
changeset
|
617 |
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
|
618 |
() public |
db3ec5f79ab9
tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3620
diff
changeset
|
619 |
|
3623
71fbb679e311
evolve: use the new rebased changeset to resolve phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3621
diff
changeset
|
620 |
$ 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
|
621 |
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
|
622 |
| 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
|
623 |
| |
db3ec5f79ab9
tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3620
diff
changeset
|
624 |
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
|
625 |
| 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
|
626 |
| |
3623
71fbb679e311
evolve: use the new rebased changeset to resolve phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3621
diff
changeset
|
627 |
@ 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
|
628 |
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
|
629 |
|
3623
71fbb679e311
evolve: use the new rebased changeset to resolve phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3621
diff
changeset
|
630 |
|
3621
db3ec5f79ab9
tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3620
diff
changeset
|
631 |
$ 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
|
632 |
# 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
|
633 |
# 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
|
634 |
# 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
|
635 |
# 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
|
636 |
# Node ID 2352021b37851be226ebed109b0eb6eada918566 |
71fbb679e311
evolve: use the new rebased changeset to resolve phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3621
diff
changeset
|
637 |
# 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
|
638 |
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
|
639 |
|
3623
71fbb679e311
evolve: use the new rebased changeset to resolve phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3621
diff
changeset
|
640 |
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
|
641 |
--- /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
|
642 |
+++ 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
|
643 |
@@ -0,0 +1,1 @@ |
71fbb679e311
evolve: use the new rebased changeset to resolve phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3621
diff
changeset
|
644 |
+x |
3626
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
645 |
|
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
646 |
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
|
647 |
conflicts |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
648 |
----------------------------------------------------------------------------- |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
649 |
|
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
650 |
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
|
651 |
|
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
652 |
$ hg glog |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
653 |
@ 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
|
654 |
| (bm) public |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
655 |
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
|
656 |
| () public |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
657 |
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
|
658 |
| () public |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
659 |
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
|
660 |
| () public |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
661 |
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
|
662 |
| () public |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
663 |
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
|
664 |
| () public |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
665 |
o 0:d3873e73d99e init |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
666 |
() public |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
667 |
|
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
668 |
$ echo y > y |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
669 |
$ echo foobar >> foo |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
670 |
$ hg add y |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
671 |
$ 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
|
672 |
$ hg rebase -r . -d .^^^ |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
673 |
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
|
674 |
|
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
675 |
$ echo foo > y |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
676 |
$ hg amend |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
677 |
|
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
678 |
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
|
679 |
|
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
680 |
$ 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
|
681 |
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
|
682 |
$ hg glog |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
683 |
@ 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
|
684 |
| () draft |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
685 |
| 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
|
686 |
| | () public |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
687 |
| 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
|
688 |
| | (bm) public |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
689 |
| 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
|
690 |
|/ () public |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
691 |
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
|
692 |
| () public |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
693 |
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
|
694 |
| () public |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
695 |
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
|
696 |
| () public |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
697 |
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
|
698 |
| () public |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
699 |
o 0:d3873e73d99e init |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
700 |
() public |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
701 |
|
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
702 |
$ hg obslog -r . |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
703 |
@ 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
|
704 |
| |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
705 |
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
|
706 |
| 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
|
707 |
| |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
708 |
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
|
709 |
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
|
710 |
|
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
711 |
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
|
712 |
------------------------------------- |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
713 |
|
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
714 |
$ hg evolve --phase-divergent |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
715 |
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
|
716 |
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
|
717 |
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
|
718 |
committed as 8c2bb6fb44e9 |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
719 |
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
|
720 |
|
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
721 |
$ hg exp |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
722 |
# HG changeset patch |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
723 |
# User test |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
724 |
# Date 0 0 |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
725 |
# 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
|
726 |
# Node ID 8c2bb6fb44e9443c64b3a2a3d061272c8e25e6ce |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
727 |
# Parent dc88f5aa9bc90a6418899d267d9524205dfb429b |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
728 |
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
|
729 |
|
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
730 |
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
|
731 |
|
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
732 |
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
|
733 |
--- 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
|
734 |
+++ 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
|
735 |
@@ -1,1 +1,1 @@ |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
736 |
-y |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
737 |
+foo |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
738 |
|
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
739 |
$ hg glog |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
740 |
@ 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
|
741 |
| () draft |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
742 |
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
|
743 |
| () public |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
744 |
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
|
745 |
| (bm) public |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
746 |
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
|
747 |
| () public |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
748 |
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
|
749 |
| () public |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
750 |
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
|
751 |
| () public |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
752 |
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
|
753 |
| () public |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
754 |
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
|
755 |
| () public |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
756 |
o 0:d3873e73d99e init |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
757 |
() public |
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 |
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
|
760 |
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
|
761 |
----------------------------------------------------------------------------- |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
762 |
|
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
763 |
$ echo l > l |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
764 |
$ 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
|
765 |
$ hg rebase -r . -d .^^^^ |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
766 |
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
|
767 |
$ echo kl > l |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
768 |
$ echo foo > x |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
769 |
$ hg add x |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
770 |
$ hg amend |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
771 |
|
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
772 |
$ hg obslog -r . |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
773 |
@ 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
|
774 |
| |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
775 |
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
|
776 |
| 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
|
777 |
| |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
778 |
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
|
779 |
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
|
780 |
|
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
781 |
|
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
782 |
$ 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
|
783 |
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
|
784 |
|
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
785 |
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
|
786 |
---------------------------------------------- |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
787 |
|
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
788 |
$ hg evolve --phase-divergent |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
789 |
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
|
790 |
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
|
791 |
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
|
792 |
merging x |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
793 |
warning: conflicts while merging x! (edit, then use 'hg resolve --mark') |
3852
629558d09898
evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3843
diff
changeset
|
794 |
fix conflicts and see `hg help evolve.interrupted` |
629558d09898
evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3843
diff
changeset
|
795 |
[1] |
3626
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
796 |
|
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
797 |
$ hg diff |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
798 |
diff -r 8c2bb6fb44e9 l |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
799 |
--- /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
|
800 |
+++ 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
|
801 |
@@ -0,0 +1,1 @@ |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
802 |
+kl |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
803 |
diff -r 8c2bb6fb44e9 x |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
804 |
--- 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
|
805 |
+++ 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
|
806 |
@@ -1,1 +1,5 @@ |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
807 |
+<<<<<<< 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
|
808 |
x |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
809 |
+======= |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
810 |
+foo |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
811 |
+>>>>>>> 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
|
812 |
|
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
813 |
$ echo foo > x |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
814 |
|
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
815 |
$ hg resolve -m |
760210aa0d78
tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3625
diff
changeset
|
816 |
(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
|
817 |
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
|
818 |
|
170b99a9c0b4
evolve: write data to evolvestate in case on conflicts in phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3626
diff
changeset
|
819 |
$ hg evolve --continue |
3633
ed3032ee53eb
evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3629
diff
changeset
|
820 |
evolving 19:5fd38c0de46e "added l to l" |
ed3032ee53eb
evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3629
diff
changeset
|
821 |
committed as e3090241a10c |
ed3032ee53eb
evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3629
diff
changeset
|
822 |
working directory is now at e3090241a10c |
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 |
3633
ed3032ee53eb
evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3629
diff
changeset
|
825 |
@ 21:e3090241a10c phase-divergent update to f3794e5a91dc: |
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 |
3633
ed3032ee53eb
evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3629
diff
changeset
|
827 |
o 17:f3794e5a91dc added l to l |
ed3032ee53eb
evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3629
diff
changeset
|
828 |
| () public |
ed3032ee53eb
evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3629
diff
changeset
|
829 |
o 16:8c2bb6fb44e9 phase-divergent update to dc88f5aa9bc9: |
ed3032ee53eb
evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3629
diff
changeset
|
830 |
| () public |
ed3032ee53eb
evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3629
diff
changeset
|
831 |
o 12:dc88f5aa9bc9 y to y and foobar to foo |
ed3032ee53eb
evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3629
diff
changeset
|
832 |
| () public |
ed3032ee53eb
evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3629
diff
changeset
|
833 |
o 9:2352021b3785 added x to x |
ed3032ee53eb
evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3629
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 |
3633
ed3032ee53eb
evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3629
diff
changeset
|
847 |
|
ed3032ee53eb
evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3629
diff
changeset
|
848 |
$ hg exp |
ed3032ee53eb
evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3629
diff
changeset
|
849 |
# HG changeset patch |
ed3032ee53eb
evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3629
diff
changeset
|
850 |
# User test |
ed3032ee53eb
evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3629
diff
changeset
|
851 |
# Date 0 0 |
ed3032ee53eb
evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3629
diff
changeset
|
852 |
# Thu Jan 01 00:00:00 1970 +0000 |
ed3032ee53eb
evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3629
diff
changeset
|
853 |
# Node ID e3090241a10c320b6132e4673915fd6b19c0de39 |
ed3032ee53eb
evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3629
diff
changeset
|
854 |
# Parent f3794e5a91dc1d4d36fee5c423386b19433a1f48 |
ed3032ee53eb
evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3629
diff
changeset
|
855 |
phase-divergent update to f3794e5a91dc: |
ed3032ee53eb
evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3629
diff
changeset
|
856 |
|
ed3032ee53eb
evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3629
diff
changeset
|
857 |
added l to l |
ed3032ee53eb
evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3629
diff
changeset
|
858 |
|
ed3032ee53eb
evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3629
diff
changeset
|
859 |
diff -r f3794e5a91dc -r e3090241a10c l |
ed3032ee53eb
evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3629
diff
changeset
|
860 |
--- a/l Thu Jan 01 00:00:00 1970 +0000 |
ed3032ee53eb
evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3629
diff
changeset
|
861 |
+++ b/l Thu Jan 01 00:00:00 1970 +0000 |
ed3032ee53eb
evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3629
diff
changeset
|
862 |
@@ -1,1 +1,1 @@ |
ed3032ee53eb
evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3629
diff
changeset
|
863 |
-l |
ed3032ee53eb
evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3629
diff
changeset
|
864 |
+kl |
ed3032ee53eb
evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3629
diff
changeset
|
865 |
diff -r f3794e5a91dc -r e3090241a10c x |
ed3032ee53eb
evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3629
diff
changeset
|
866 |
--- a/x Thu Jan 01 00:00:00 1970 +0000 |
ed3032ee53eb
evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3629
diff
changeset
|
867 |
+++ b/x Thu Jan 01 00:00:00 1970 +0000 |
ed3032ee53eb
evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3629
diff
changeset
|
868 |
@@ -1,1 +1,1 @@ |
ed3032ee53eb
evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3629
diff
changeset
|
869 |
-x |
ed3032ee53eb
evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3629
diff
changeset
|
870 |
+foo |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
871 |
|
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
872 |
Creating phase divergence when couple of changesets are folded into one |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
873 |
------------------------------------------------------------------------ |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
874 |
|
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
875 |
$ hg glog -r . |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
876 |
@ 21:e3090241a10c phase-divergent update to f3794e5a91dc: |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
877 |
| () draft |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
878 |
~ |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
879 |
$ echo f > f |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
880 |
$ hg ci -Aqm "added f" |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
881 |
$ echo g > g |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
882 |
$ hg ci -Aqm "added g" |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
883 |
|
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
884 |
$ hg fold -r . -r .^ --exact |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
885 |
2 changesets folded |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
886 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
887 |
|
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
888 |
$ hg evolve --list |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
889 |
|
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
890 |
$ hg phase -r 428f7900a969 --public --hidden |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
891 |
1 new phase-divergent changesets |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
892 |
|
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
893 |
$ hg glog -r f3794e5a91dc:: |
4340
5300be965515
fold: sort concatenated commit messages in topological order
Martin von Zweigbergk <martinvonz@google.com>
parents:
4181
diff
changeset
|
894 |
@ 24:390acb97e50a added f |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
895 |
| () draft |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
896 |
| o 23:428f7900a969 added g |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
897 |
| | () public |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
898 |
| o 22:21ae52e414e6 added f |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
899 |
|/ () public |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
900 |
o 21:e3090241a10c phase-divergent update to f3794e5a91dc: |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
901 |
| () public |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
902 |
o 17:f3794e5a91dc added l to l |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
903 |
| () public |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
904 |
~ |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
905 |
|
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
906 |
$ hg evolve --list |
4340
5300be965515
fold: sort concatenated commit messages in topological order
Martin von Zweigbergk <martinvonz@google.com>
parents:
4181
diff
changeset
|
907 |
390acb97e50a: added f |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
908 |
phase-divergent: 21ae52e414e6 (immutable precursor) |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
909 |
phase-divergent: 428f7900a969 (immutable precursor) |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
910 |
|
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
911 |
Resolving phase divergence using `hg evolve` |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
912 |
|
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
913 |
$ hg evolve --phase-divergent --all |
4340
5300be965515
fold: sort concatenated commit messages in topological order
Martin von Zweigbergk <martinvonz@google.com>
parents:
4181
diff
changeset
|
914 |
recreate:[24] added f |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
915 |
atop:[23] added g |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
916 |
rebasing to destination parent: 21ae52e414e6 |
4453
700b8b3a5a54
evolve: clarify output when phase-divergence resolution results in no change
Martin von Zweigbergk <martinvonz@google.com>
parents:
4452
diff
changeset
|
917 |
no changes to commit |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
918 |
working directory is now at 428f7900a969 |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
919 |
|
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
920 |
$ hg glog -r f3794e5a91dc:: |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
921 |
@ 23:428f7900a969 added g |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
922 |
| () public |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
923 |
o 22:21ae52e414e6 added f |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
924 |
| () public |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
925 |
o 21:e3090241a10c phase-divergent update to f3794e5a91dc: |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
926 |
| () public |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
927 |
o 17:f3794e5a91dc added l to l |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
928 |
| () public |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
929 |
~ |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
930 |
|
4455
b58e45aa9be2
test: use 'split' instead of 'splitted' in the tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4454
diff
changeset
|
931 |
When the public changesets is split causing phase-divergence |
b58e45aa9be2
test: use 'split' instead of 'splitted' in the tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4454
diff
changeset
|
932 |
------------------------------------------------------------ |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
933 |
|
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
934 |
$ cd ../split |
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
935 |
|
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
936 |
$ echo m > m |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
937 |
$ echo n > n |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
938 |
$ hg ci -Aqm "added m and n" |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
939 |
|
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
940 |
$ hg glog |
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
941 |
@ 1:a51bce62c219 added m and n |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
942 |
| () draft |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
943 |
o 0:d3873e73d99e init |
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
944 |
() public |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
945 |
|
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
946 |
$ hg prev |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
947 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
948 |
[0] init |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
949 |
$ echo m > m |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
950 |
$ hg ci -Aqm "added m" |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
951 |
$ echo n > n |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
952 |
$ hg ci -Aqm "added n" |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
953 |
|
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
954 |
$ hg glog |
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
955 |
@ 3:e1154ec0206a added n |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
956 |
| () draft |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
957 |
o 2:4f25cd9cd2bf added m |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
958 |
| () draft |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
959 |
| o 1:a51bce62c219 added m and n |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
960 |
|/ () draft |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
961 |
o 0:d3873e73d99e init |
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
962 |
() public |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
963 |
|
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
964 |
$ hg prune -r a51bce62c219 --succ 4f25cd9cd2bf --succ e1154ec0206a --split |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
965 |
1 changesets pruned |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
966 |
|
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
967 |
$ hg phase -r a51bce62c219 --hidden --public |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
968 |
2 new phase-divergent changesets |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
969 |
|
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
970 |
$ hg glog |
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
971 |
@ 3:e1154ec0206a added n |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
972 |
| () draft |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
973 |
* 2:4f25cd9cd2bf added m |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
974 |
| () draft |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
975 |
| o 1:a51bce62c219 added m and n |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
976 |
|/ () public |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
977 |
o 0:d3873e73d99e init |
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
978 |
() public |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
979 |
|
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
980 |
$ hg evolve --all --phase-divergent |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
981 |
recreate:[2] added m |
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
982 |
atop:[1] added m and n |
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
983 |
committed as 86419909e017 |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
984 |
1 new orphan changesets |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
985 |
recreate:[3] added n |
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
986 |
atop:[1] added m and n |
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
987 |
rebasing to destination parent: d3873e73d99e |
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
988 |
committed as 89ba615ea1ec |
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
989 |
working directory is now at 89ba615ea1ec |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
990 |
|
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
991 |
XXX: this is messy, we should solve things in better way |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
992 |
$ hg glog --hidden |
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
993 |
@ 6:89ba615ea1ec phase-divergent update to a51bce62c219: |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
994 |
| () draft |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
995 |
| x 5:ee4af146c5cf added n |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
996 |
| | () draft |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
997 |
+---o 4:86419909e017 phase-divergent update to a51bce62c219: |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
998 |
| | () draft |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
999 |
| | x 3:e1154ec0206a added n |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1000 |
| | | () draft |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1001 |
| | x 2:4f25cd9cd2bf added m |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1002 |
| |/ () draft |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1003 |
o | 1:a51bce62c219 added m and n |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1004 |
|/ () public |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1005 |
o 0:d3873e73d99e init |
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1006 |
() public |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1007 |
|
4457
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1008 |
$ hg obslog -r a51bce62c219 --all |
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1009 |
o 86419909e017 (4) phase-divergent update to a51bce62c219: |
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1010 |
| |
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1011 |
| @ 89ba615ea1ec (6) phase-divergent update to a51bce62c219: |
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1012 |
| | |
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1013 |
x | 4f25cd9cd2bf (2) added m |
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1014 |
| | rewritten(description, parent, content) as 86419909e017 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1015 |
| | |
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1016 |
| x ee4af146c5cf (5) added n |
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1017 |
| | rewritten(description, parent, content) as 89ba615ea1ec using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1018 |
| | |
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1019 |
| x e1154ec0206a (3) added n |
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1020 |
|/ rewritten(parent) as ee4af146c5cf using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1021 |
| |
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1022 |
o a51bce62c219 (1) added m and n |
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1023 |
rewritten(description, parent, content) as 4f25cd9cd2bf, e1154ec0206a using prune by test (Thu Jan 01 00:00:00 1970 +0000) |
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1024 |
|
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1025 |
|
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1026 |
XXX: not sure this is the correct |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1027 |
$ hg exp 89ba615ea1ec |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1028 |
# HG changeset patch |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1029 |
# User test |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1030 |
# Date 0 0 |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1031 |
# Thu Jan 01 00:00:00 1970 +0000 |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1032 |
# Node ID 89ba615ea1ec3ba5b25db9f7897eb29712d7e5d6 |
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1033 |
# Parent a51bce62c219f024bc0ae0cc0e3957ee77d7cb46 |
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1034 |
phase-divergent update to a51bce62c219: |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1035 |
|
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1036 |
added n |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1037 |
|
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1038 |
diff -r a51bce62c219 -r 89ba615ea1ec m |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1039 |
--- a/m Thu Jan 01 00:00:00 1970 +0000 |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1040 |
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1041 |
@@ -1,1 +0,0 @@ |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1042 |
-m |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1043 |
|
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1044 |
XXX: not sure this is correct |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1045 |
$ hg exp 86419909e017 |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1046 |
# HG changeset patch |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1047 |
# User test |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1048 |
# Date 0 0 |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1049 |
# Thu Jan 01 00:00:00 1970 +0000 |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1050 |
# Node ID 86419909e01787959aa6471aee605c6d604a3e0d |
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1051 |
# Parent a51bce62c219f024bc0ae0cc0e3957ee77d7cb46 |
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1052 |
phase-divergent update to a51bce62c219: |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1053 |
|
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1054 |
added m |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1055 |
|
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1056 |
diff -r a51bce62c219 -r 86419909e017 n |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1057 |
--- a/n Thu Jan 01 00:00:00 1970 +0000 |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1058 |
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1059 |
@@ -1,1 +0,0 @@ |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1060 |
-n |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1061 |
|
4455
b58e45aa9be2
test: use 'split' instead of 'splitted' in the tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4454
diff
changeset
|
1062 |
When the public changeset is split across various branches |
b58e45aa9be2
test: use 'split' instead of 'splitted' in the tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4454
diff
changeset
|
1063 |
---------------------------------------------------------- |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1064 |
|
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1065 |
$ cd ../split-across-branches |
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1066 |
|
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1067 |
$ echo p > p |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1068 |
$ echo q > q |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1069 |
$ hg ci -Aqm "added p and q" |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1070 |
|
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1071 |
$ hg prev |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1072 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1073 |
[0] init |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1074 |
$ echo p > p |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1075 |
$ hg ci -Aqm "added p" |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1076 |
$ hg prev |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1077 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1078 |
[0] init |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1079 |
$ echo q > q |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1080 |
$ hg ci -Aqm "added q" |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1081 |
|
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1082 |
$ hg glog |
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1083 |
@ 3:bb87595f9a77 added q |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1084 |
| () draft |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1085 |
| o 2:a47263294745 added p |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1086 |
|/ () draft |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1087 |
| o 1:90859808ece6 added p and q |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1088 |
|/ () draft |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1089 |
o 0:d3873e73d99e init |
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1090 |
() public |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1091 |
|
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1092 |
$ hg prune -r 90859808ece6 --succ a47263294745 --succ bb87595f9a77 --split |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1093 |
1 changesets pruned |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1094 |
|
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1095 |
$ hg phase -r 90859808ece6 --public --hidden |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1096 |
2 new phase-divergent changesets |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1097 |
|
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1098 |
$ hg glog |
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1099 |
@ 3:bb87595f9a77 added q |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1100 |
| () draft |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1101 |
| * 2:a47263294745 added p |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1102 |
|/ () draft |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1103 |
| o 1:90859808ece6 added p and q |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1104 |
|/ () public |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1105 |
o 0:d3873e73d99e init |
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1106 |
() public |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1107 |
|
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1108 |
$ hg evolve --list |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1109 |
a47263294745: added p |
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1110 |
phase-divergent: 90859808ece6 (immutable precursor) |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1111 |
|
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1112 |
bb87595f9a77: added q |
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1113 |
phase-divergent: 90859808ece6 (immutable precursor) |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1114 |
|
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1115 |
$ hg evolve --all --phase-divergent |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1116 |
recreate:[2] added p |
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1117 |
atop:[1] added p and q |
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1118 |
committed as 25875a9cb640 |
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1119 |
recreate:[3] added q |
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1120 |
atop:[1] added p and q |
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1121 |
committed as 26f564f94bcc |
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1122 |
working directory is now at 26f564f94bcc |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1123 |
|
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1124 |
$ hg glog --hidden |
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1125 |
@ 5:26f564f94bcc phase-divergent update to 90859808ece6: |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1126 |
| () draft |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1127 |
| o 4:25875a9cb640 phase-divergent update to 90859808ece6: |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1128 |
|/ () draft |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1129 |
| x 3:bb87595f9a77 added q |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1130 |
| | () draft |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1131 |
| | x 2:a47263294745 added p |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1132 |
| |/ () draft |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1133 |
o | 1:90859808ece6 added p and q |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1134 |
|/ () public |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1135 |
o 0:d3873e73d99e init |
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1136 |
() public |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1137 |
|
4457
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1138 |
$ hg obslog -r 90859808ece6 --all |
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1139 |
o 25875a9cb640 (4) phase-divergent update to 90859808ece6: |
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1140 |
| |
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1141 |
| @ 26f564f94bcc (5) phase-divergent update to 90859808ece6: |
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1142 |
| | |
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1143 |
x | a47263294745 (2) added p |
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1144 |
| | rewritten(description, parent, content) as 25875a9cb640 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1145 |
| | |
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1146 |
| x bb87595f9a77 (3) added q |
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1147 |
|/ rewritten(description, parent, content) as 26f564f94bcc using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1148 |
| |
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1149 |
o 90859808ece6 (1) added p and q |
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1150 |
rewritten(description, content) as a47263294745, bb87595f9a77 using prune by test (Thu Jan 01 00:00:00 1970 +0000) |
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1151 |
|
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1152 |
|
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1153 |
XXX: not sure this is correct |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1154 |
$ hg exp 26f564f94bcc |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1155 |
# HG changeset patch |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1156 |
# User test |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1157 |
# Date 0 0 |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1158 |
# Thu Jan 01 00:00:00 1970 +0000 |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1159 |
# Node ID 26f564f94bcc34e049eb112fd14ab1e5286f2325 |
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1160 |
# Parent 90859808ece64c9ca64dd29992db42353c70f164 |
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1161 |
phase-divergent update to 90859808ece6: |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1162 |
|
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1163 |
added q |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1164 |
|
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1165 |
diff -r 90859808ece6 -r 26f564f94bcc p |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1166 |
--- a/p Thu Jan 01 00:00:00 1970 +0000 |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1167 |
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1168 |
@@ -1,1 +0,0 @@ |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1169 |
-p |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1170 |
|
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1171 |
XXX: not sure this is correct |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1172 |
$ hg exp 25875a9cb640 |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1173 |
# HG changeset patch |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1174 |
# User test |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1175 |
# Date 0 0 |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1176 |
# Thu Jan 01 00:00:00 1970 +0000 |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1177 |
# Node ID 25875a9cb6400973b846c94f6a80410067c2cb1f |
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1178 |
# Parent 90859808ece64c9ca64dd29992db42353c70f164 |
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1179 |
phase-divergent update to 90859808ece6: |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1180 |
|
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1181 |
added p |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1182 |
|
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1183 |
diff -r 90859808ece6 -r 25875a9cb640 q |
3634
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1184 |
--- a/q Thu Jan 01 00:00:00 1970 +0000 |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1185 |
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1186 |
@@ -1,1 +0,0 @@ |
a9fed41c6bed
tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3633
diff
changeset
|
1187 |
-q |
3637
1b9c2720faee
tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3634
diff
changeset
|
1188 |
|
4456
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1189 |
When the public changeset is split and amended |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1190 |
-------------------------------------------------------------- |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1191 |
|
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1192 |
$ cd ../split-and-amend |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1193 |
|
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1194 |
$ echo m > m |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1195 |
$ echo n > n |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1196 |
$ hg ci -Aqm "added m and n" |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1197 |
$ hg prev |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1198 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1199 |
[0] init |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1200 |
$ echo m > m |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1201 |
$ hg ci -Aqm "added m" |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1202 |
$ echo n > n |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1203 |
$ hg ci -Aqm "added n" |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1204 |
|
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1205 |
$ hg glog |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1206 |
@ 3:e1154ec0206a added n |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1207 |
| () draft |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1208 |
o 2:4f25cd9cd2bf added m |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1209 |
| () draft |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1210 |
| o 1:a51bce62c219 added m and n |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1211 |
|/ () draft |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1212 |
o 0:d3873e73d99e init |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1213 |
() public |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1214 |
|
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1215 |
$ hg prune -r a51bce62c219 --succ 4f25cd9cd2bf --succ e1154ec0206a --split |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1216 |
1 changesets pruned |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1217 |
|
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1218 |
$ echo n2 > n |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1219 |
$ hg amend |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1220 |
|
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1221 |
$ hg phase -r a51bce62c219 --public --hidden |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1222 |
2 new phase-divergent changesets |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1223 |
|
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1224 |
$ hg glog |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1225 |
@ 4:52ca78bb98c7 added n |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1226 |
| () draft |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1227 |
* 2:4f25cd9cd2bf added m |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1228 |
| () draft |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1229 |
| o 1:a51bce62c219 added m and n |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1230 |
|/ () public |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1231 |
o 0:d3873e73d99e init |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1232 |
() public |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1233 |
|
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1234 |
$ hg evolve --list |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1235 |
4f25cd9cd2bf: added m |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1236 |
phase-divergent: a51bce62c219 (immutable precursor) |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1237 |
|
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1238 |
52ca78bb98c7: added n |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1239 |
phase-divergent: a51bce62c219 (immutable precursor) |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1240 |
|
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1241 |
$ hg evolve --all --phase-divergent |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1242 |
recreate:[2] added m |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1243 |
atop:[1] added m and n |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1244 |
committed as 86419909e017 |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1245 |
1 new orphan changesets |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1246 |
recreate:[4] added n |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1247 |
atop:[1] added m and n |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1248 |
rebasing to destination parent: d3873e73d99e |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1249 |
committed as 88b0dae5369a |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1250 |
working directory is now at 88b0dae5369a |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1251 |
|
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1252 |
$ hg glog --hidden |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1253 |
@ 7:88b0dae5369a phase-divergent update to a51bce62c219: |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1254 |
| () draft |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1255 |
| x 6:98dad8812511 added n |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1256 |
| | () draft |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1257 |
+---o 5:86419909e017 phase-divergent update to a51bce62c219: |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1258 |
| | () draft |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1259 |
| | x 4:52ca78bb98c7 added n |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1260 |
| | | () draft |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1261 |
| | | x 3:e1154ec0206a added n |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1262 |
| | |/ () draft |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1263 |
| | x 2:4f25cd9cd2bf added m |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1264 |
| |/ () draft |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1265 |
o | 1:a51bce62c219 added m and n |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1266 |
|/ () public |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1267 |
o 0:d3873e73d99e init |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1268 |
() public |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1269 |
|
4457
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1270 |
$ hg obslog -r a51bce62c219 --all |
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1271 |
o 86419909e017 (5) phase-divergent update to a51bce62c219: |
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1272 |
| |
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1273 |
| @ 88b0dae5369a (7) phase-divergent update to a51bce62c219: |
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1274 |
| | |
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1275 |
x | 4f25cd9cd2bf (2) added m |
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1276 |
| | rewritten(description, parent, content) as 86419909e017 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1277 |
| | |
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1278 |
| x 98dad8812511 (6) added n |
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1279 |
| | rewritten(description, parent, content) as 88b0dae5369a using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1280 |
| | |
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1281 |
| x 52ca78bb98c7 (4) added n |
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1282 |
| | rewritten(parent) as 98dad8812511 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1283 |
| | |
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1284 |
| x e1154ec0206a (3) added n |
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1285 |
|/ rewritten(content) as 52ca78bb98c7 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1286 |
| |
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1287 |
o a51bce62c219 (1) added m and n |
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1288 |
rewritten(description, parent, content) as 4f25cd9cd2bf, e1154ec0206a using prune by test (Thu Jan 01 00:00:00 1970 +0000) |
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1289 |
|
218fa7c1fe4b
tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents:
4456
diff
changeset
|
1290 |
|
4456
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1291 |
XXX: not sure this is correct |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1292 |
$ hg exp 86419909e017 |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1293 |
# HG changeset patch |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1294 |
# User test |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1295 |
# Date 0 0 |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1296 |
# Thu Jan 01 00:00:00 1970 +0000 |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1297 |
# Node ID 86419909e01787959aa6471aee605c6d604a3e0d |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1298 |
# Parent a51bce62c219f024bc0ae0cc0e3957ee77d7cb46 |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1299 |
phase-divergent update to a51bce62c219: |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1300 |
|
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1301 |
added m |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1302 |
|
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1303 |
diff -r a51bce62c219 -r 86419909e017 n |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1304 |
--- a/n Thu Jan 01 00:00:00 1970 +0000 |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1305 |
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1306 |
@@ -1,1 +0,0 @@ |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1307 |
-n |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1308 |
|
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1309 |
XXX: not sure this is correct |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1310 |
$ hg exp 88b0dae5369a |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1311 |
# HG changeset patch |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1312 |
# User test |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1313 |
# Date 0 0 |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1314 |
# Thu Jan 01 00:00:00 1970 +0000 |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1315 |
# Node ID 88b0dae5369aaa3bceb6c0b647542594e2c72fb7 |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1316 |
# Parent a51bce62c219f024bc0ae0cc0e3957ee77d7cb46 |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1317 |
phase-divergent update to a51bce62c219: |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1318 |
|
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1319 |
added n |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1320 |
|
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1321 |
diff -r a51bce62c219 -r 88b0dae5369a m |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1322 |
--- a/m Thu Jan 01 00:00:00 1970 +0000 |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1323 |
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1324 |
@@ -1,1 +0,0 @@ |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1325 |
-m |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1326 |
diff -r a51bce62c219 -r 88b0dae5369a n |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1327 |
--- a/n Thu Jan 01 00:00:00 1970 +0000 |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1328 |
+++ b/n Thu Jan 01 00:00:00 1970 +0000 |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1329 |
@@ -1,1 +1,1 @@ |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1330 |
-n |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1331 |
+n2 |
b0d755a95f6c
tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
1332 |
|
3637
1b9c2720faee
tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3634
diff
changeset
|
1333 |
Testing the evolution of a phase-divergent merge with no conflicts |
1b9c2720faee
tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3634
diff
changeset
|
1334 |
------------------------------------------------------------------ |
1b9c2720faee
tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3634
diff
changeset
|
1335 |
|
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1336 |
$ cd ../merge-no-conflict |
3637
1b9c2720faee
tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3634
diff
changeset
|
1337 |
|
1b9c2720faee
tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3634
diff
changeset
|
1338 |
$ echo h > h |
1b9c2720faee
tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3634
diff
changeset
|
1339 |
$ hg ci -Aqm "added h" |
1b9c2720faee
tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3634
diff
changeset
|
1340 |
$ hg prev |
1b9c2720faee
tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3634
diff
changeset
|
1341 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1342 |
[0] init |
3637
1b9c2720faee
tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3634
diff
changeset
|
1343 |
$ echo i > i |
1b9c2720faee
tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3634
diff
changeset
|
1344 |
$ hg ci -Aqm "added i" |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1345 |
$ hg merge -r a53d182199c1 |
3637
1b9c2720faee
tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3634
diff
changeset
|
1346 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1b9c2720faee
tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3634
diff
changeset
|
1347 |
(branch merge, don't forget to commit) |
1b9c2720faee
tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3634
diff
changeset
|
1348 |
$ hg ci -m "merge h and i" |
1b9c2720faee
tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3634
diff
changeset
|
1349 |
|
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1350 |
$ hg glog |
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1351 |
@ 3:205b2f5ecb7b merge h and i |
3637
1b9c2720faee
tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3634
diff
changeset
|
1352 |
|\ () draft |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1353 |
| o 2:f0be5e638ecf added i |
3637
1b9c2720faee
tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3634
diff
changeset
|
1354 |
| | () draft |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1355 |
o | 1:a53d182199c1 added h |
3637
1b9c2720faee
tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3634
diff
changeset
|
1356 |
|/ () draft |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1357 |
o 0:d3873e73d99e init |
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1358 |
() public |
3637
1b9c2720faee
tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3634
diff
changeset
|
1359 |
|
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1360 |
$ hg up a53d182199c1 |
3637
1b9c2720faee
tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3634
diff
changeset
|
1361 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1362 |
$ hg merge -r f0be5e638ecf |
3637
1b9c2720faee
tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3634
diff
changeset
|
1363 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1b9c2720faee
tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3634
diff
changeset
|
1364 |
(branch merge, don't forget to commit) |
1b9c2720faee
tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3634
diff
changeset
|
1365 |
$ hg ci -m "merge h and i successor" |
1b9c2720faee
tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3634
diff
changeset
|
1366 |
created new head |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1367 |
$ hg glog |
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1368 |
@ 4:8d4acf488ab5 merge h and i successor |
3637
1b9c2720faee
tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3634
diff
changeset
|
1369 |
|\ () draft |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1370 |
+---o 3:205b2f5ecb7b merge h and i |
3637
1b9c2720faee
tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3634
diff
changeset
|
1371 |
| |/ () draft |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1372 |
| o 2:f0be5e638ecf added i |
3637
1b9c2720faee
tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3634
diff
changeset
|
1373 |
| | () draft |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1374 |
o | 1:a53d182199c1 added h |
3637
1b9c2720faee
tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3634
diff
changeset
|
1375 |
|/ () draft |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1376 |
o 0:d3873e73d99e init |
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1377 |
() public |
3637
1b9c2720faee
tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3634
diff
changeset
|
1378 |
|
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1379 |
$ hg prune -r 205b2f5ecb7b --succ . |
3637
1b9c2720faee
tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3634
diff
changeset
|
1380 |
1 changesets pruned |
1b9c2720faee
tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3634
diff
changeset
|
1381 |
|
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1382 |
$ hg phase 205b2f5ecb7b --hidden --public |
3637
1b9c2720faee
tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3634
diff
changeset
|
1383 |
1 new phase-divergent changesets |
1b9c2720faee
tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3634
diff
changeset
|
1384 |
|
1b9c2720faee
tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3634
diff
changeset
|
1385 |
Resolution of phase-divergent merge commit using `hg evolve` |
1b9c2720faee
tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3634
diff
changeset
|
1386 |
|
1b9c2720faee
tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3634
diff
changeset
|
1387 |
XXX: we should handle phase-divergent merges |
1b9c2720faee
tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3634
diff
changeset
|
1388 |
$ hg evolve --phase-divergent |
4452
444e664616c7
tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents:
4448
diff
changeset
|
1389 |
skipping 8d4acf488ab5 : we do not handle merge yet |