author | Anton Shestakov <av6@dwimlabs.net> |
Thu, 23 Jan 2020 19:33:40 +0700 | |
branch | stable |
changeset 5094 | a2391f919141 |
parent 4993 | e0b5ce458af5 |
child 5015 | 43f4784a3f21 |
child 5090 | 2631e735ec16 |
permissions | -rw-r--r-- |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4424
diff
changeset
|
1 |
================================================= |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4424
diff
changeset
|
2 |
Tests the resolution of content divergence: stack |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4424
diff
changeset
|
3 |
================================================= |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4424
diff
changeset
|
4 |
|
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4424
diff
changeset
|
5 |
This file intend to cover case with stacks of divergent changesets |
3790
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
6 |
|
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
7 |
$ cat >> $HGRCPATH <<EOF |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
8 |
> [alias] |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
9 |
> glog = log -GT "{rev}:{node|short} {desc|firstline}\n ({bookmarks}) [{branch}] {phase}" |
3844
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
10 |
> [phases] |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
11 |
> publish = False |
3790
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
12 |
> [extensions] |
3804
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
13 |
> rebase = |
3790
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
14 |
> EOF |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
15 |
$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
16 |
|
3844
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
17 |
Resolving content-divergence of a stack with same parents |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
18 |
--------------------------------------------------------- |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
19 |
|
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
20 |
$ hg init stacktest |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
21 |
$ cd stacktest |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
22 |
$ echo ".*\.orig" > .hgignore |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
23 |
$ hg add .hgignore |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
24 |
$ hg ci -m "added hgignore" |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
25 |
$ for ch in a b c d; do echo foo > $ch; hg add $ch; hg ci -qm "added "$ch; done; |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
26 |
|
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
27 |
$ hg glog |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
28 |
@ 4:c41c793e0ef1 added d |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
29 |
| () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
30 |
o 3:ca1b80f7960a added c |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
31 |
| () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
32 |
o 2:b1661037fa25 added b |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
33 |
| () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
34 |
o 1:c7586e2a9264 added a |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
35 |
| () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
36 |
o 0:8fa14d15e168 added hgignore |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
37 |
() [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
38 |
|
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
39 |
$ cd .. |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
40 |
$ hg init stack2 |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
41 |
$ cd stack2 |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
42 |
$ hg pull ../stacktest |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
43 |
pulling from ../stacktest |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
44 |
requesting all changes |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
45 |
adding changesets |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
46 |
adding manifests |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
47 |
adding file changes |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
48 |
added 5 changesets with 5 changes to 5 files |
4181
ab3581bc0637
branching: preserve the expected output on default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4165
diff
changeset
|
49 |
new changesets 8fa14d15e168:c41c793e0ef1 (5 drafts) |
3844
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
50 |
(run 'hg update' to get a working copy) |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
51 |
$ hg glog |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
52 |
o 4:c41c793e0ef1 added d |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
53 |
| () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
54 |
o 3:ca1b80f7960a added c |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
55 |
| () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
56 |
o 2:b1661037fa25 added b |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
57 |
| () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
58 |
o 1:c7586e2a9264 added a |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
59 |
| () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
60 |
o 0:8fa14d15e168 added hgignore |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
61 |
() [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
62 |
|
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
63 |
$ hg up c7586e2a9264 |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
64 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
65 |
$ echo bar > a |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
66 |
$ hg amend -m "watbar to a" |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
67 |
3 new orphan changesets |
3849
a17d4934c5ce
tests: fix a test case to not create conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3846
diff
changeset
|
68 |
$ echo wat > a |
a17d4934c5ce
tests: fix a test case to not create conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3846
diff
changeset
|
69 |
$ hg amend -m "watbar to a" |
3844
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
70 |
$ hg evolve --all |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
71 |
move:[2] added b |
3849
a17d4934c5ce
tests: fix a test case to not create conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3846
diff
changeset
|
72 |
atop:[6] watbar to a |
3844
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
73 |
move:[3] added c |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
74 |
move:[4] added d |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
75 |
$ hg glog |
4577
bcd52ce0916d
evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
4490
diff
changeset
|
76 |
o 9:15c781f93cac added d |
3844
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
77 |
| () [default] draft |
3849
a17d4934c5ce
tests: fix a test case to not create conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3846
diff
changeset
|
78 |
o 8:9e5fb1d5b955 added c |
3844
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
79 |
| () [default] draft |
3849
a17d4934c5ce
tests: fix a test case to not create conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3846
diff
changeset
|
80 |
o 7:88516dccf68a added b |
3844
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
81 |
| () [default] draft |
4577
bcd52ce0916d
evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
4490
diff
changeset
|
82 |
@ 6:82b74d5dc678 watbar to a |
3844
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
83 |
| () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
84 |
o 0:8fa14d15e168 added hgignore |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
85 |
() [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
86 |
|
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
87 |
$ cd ../stacktest |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
88 |
$ hg up .^^^ |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
89 |
0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
90 |
$ echo wat > a |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
91 |
$ hg amend -m "watbar to a" |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
92 |
3 new orphan changesets |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
93 |
$ hg evolve --all |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
94 |
move:[2] added b |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
95 |
atop:[5] watbar to a |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
96 |
move:[3] added c |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
97 |
move:[4] added d |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
98 |
$ hg glog |
4577
bcd52ce0916d
evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
4490
diff
changeset
|
99 |
o 8:c72d2885eb51 added d |
3844
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
100 |
| () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
101 |
o 7:3ce4be6d8e5e added c |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
102 |
| () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
103 |
o 6:d5f148423c16 added b |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
104 |
| () [default] draft |
4577
bcd52ce0916d
evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
4490
diff
changeset
|
105 |
@ 5:8e222f257bbf watbar to a |
3844
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
106 |
| () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
107 |
o 0:8fa14d15e168 added hgignore |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
108 |
() [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
109 |
|
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
110 |
$ hg pull ../stack2 |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
111 |
pulling from ../stack2 |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
112 |
searching for changes |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
113 |
adding changesets |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
114 |
adding manifests |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
115 |
adding file changes |
3849
a17d4934c5ce
tests: fix a test case to not create conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3846
diff
changeset
|
116 |
added 4 changesets with 0 changes to 4 files (+1 heads) |
a17d4934c5ce
tests: fix a test case to not create conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3846
diff
changeset
|
117 |
5 new obsolescence markers |
3844
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
118 |
8 new content-divergent changesets |
4181
ab3581bc0637
branching: preserve the expected output on default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4165
diff
changeset
|
119 |
new changesets 82b74d5dc678:15c781f93cac (4 drafts) |
3844
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
120 |
(run 'hg heads' to see heads, 'hg merge' to merge) |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
121 |
|
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
122 |
$ hg glog |
3849
a17d4934c5ce
tests: fix a test case to not create conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3846
diff
changeset
|
123 |
* 12:15c781f93cac added d |
3844
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
124 |
| () [default] draft |
3849
a17d4934c5ce
tests: fix a test case to not create conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3846
diff
changeset
|
125 |
* 11:9e5fb1d5b955 added c |
3844
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
126 |
| () [default] draft |
3849
a17d4934c5ce
tests: fix a test case to not create conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3846
diff
changeset
|
127 |
* 10:88516dccf68a added b |
3844
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
128 |
| () [default] draft |
3849
a17d4934c5ce
tests: fix a test case to not create conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3846
diff
changeset
|
129 |
* 9:82b74d5dc678 watbar to a |
3844
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
130 |
| () [default] draft |
4577
bcd52ce0916d
evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
4490
diff
changeset
|
131 |
| * 8:c72d2885eb51 added d |
3844
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
132 |
| | () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
133 |
| * 7:3ce4be6d8e5e added c |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
134 |
| | () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
135 |
| * 6:d5f148423c16 added b |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
136 |
| | () [default] draft |
4577
bcd52ce0916d
evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
4490
diff
changeset
|
137 |
| @ 5:8e222f257bbf watbar to a |
3844
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
138 |
|/ () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
139 |
o 0:8fa14d15e168 added hgignore |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
140 |
() [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
141 |
|
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
142 |
$ hg evolve --all --content-divergent |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
143 |
merge:[5] watbar to a |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
144 |
with: [9] watbar to a |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
145 |
base: [1] added a |
3849
a17d4934c5ce
tests: fix a test case to not create conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3846
diff
changeset
|
146 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
3850
340cf6fbe9e9
evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3849
diff
changeset
|
147 |
merge:[6] added b |
340cf6fbe9e9
evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3849
diff
changeset
|
148 |
with: [10] added b |
340cf6fbe9e9
evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3849
diff
changeset
|
149 |
base: [2] added b |
4991
2928f35023a1
evolve: make sure divergence resolution doesn't undo changes (issue6203)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4990
diff
changeset
|
150 |
rebasing "divergent" content-divergent changeset d5f148423c16 on f66f262fff6c |
3850
340cf6fbe9e9
evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3849
diff
changeset
|
151 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
340cf6fbe9e9
evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3849
diff
changeset
|
152 |
merge:[7] added c |
340cf6fbe9e9
evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3849
diff
changeset
|
153 |
with: [11] added c |
340cf6fbe9e9
evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3849
diff
changeset
|
154 |
base: [3] added c |
4991
2928f35023a1
evolve: make sure divergence resolution doesn't undo changes (issue6203)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4990
diff
changeset
|
155 |
rebasing "divergent" content-divergent changeset 3ce4be6d8e5e on eadfd9d70680 |
3850
340cf6fbe9e9
evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3849
diff
changeset
|
156 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
340cf6fbe9e9
evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3849
diff
changeset
|
157 |
merge:[8] added d |
340cf6fbe9e9
evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3849
diff
changeset
|
158 |
with: [12] added d |
340cf6fbe9e9
evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3849
diff
changeset
|
159 |
base: [4] added d |
4991
2928f35023a1
evolve: make sure divergence resolution doesn't undo changes (issue6203)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4990
diff
changeset
|
160 |
rebasing "divergent" content-divergent changeset c72d2885eb51 on b2cac10f3836 |
3850
340cf6fbe9e9
evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3849
diff
changeset
|
161 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
4577
bcd52ce0916d
evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
4490
diff
changeset
|
162 |
working directory is now at f66f262fff6c |
3844
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
163 |
|
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
164 |
$ hg glog |
4991
2928f35023a1
evolve: make sure divergence resolution doesn't undo changes (issue6203)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4990
diff
changeset
|
165 |
o 19:038fe7db3d88 added d |
3850
340cf6fbe9e9
evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3849
diff
changeset
|
166 |
| () [default] draft |
4991
2928f35023a1
evolve: make sure divergence resolution doesn't undo changes (issue6203)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4990
diff
changeset
|
167 |
o 17:b2cac10f3836 added c |
3844
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
168 |
| () [default] draft |
4991
2928f35023a1
evolve: make sure divergence resolution doesn't undo changes (issue6203)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4990
diff
changeset
|
169 |
o 15:eadfd9d70680 added b |
3850
340cf6fbe9e9
evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3849
diff
changeset
|
170 |
| () [default] draft |
4577
bcd52ce0916d
evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
4490
diff
changeset
|
171 |
@ 13:f66f262fff6c watbar to a |
3850
340cf6fbe9e9
evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3849
diff
changeset
|
172 |
| () [default] draft |
3844
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
173 |
o 0:8fa14d15e168 added hgignore |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
174 |
() [default] draft |
4441
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
175 |
Resolving content-divergence of a stack with different parents |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
176 |
--------------------------------------------------------- |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
177 |
|
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
178 |
$ cd .. |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
179 |
$ hg init stackrepo1 |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
180 |
$ cd stackrepo1 |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
181 |
$ echo ".*\.orig" > .hgignore |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
182 |
$ hg add .hgignore |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
183 |
$ hg ci -m "added hgignore" |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
184 |
|
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
185 |
$ for ch in a b c d; |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
186 |
> do echo foo > $ch; |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
187 |
> hg add $ch; |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
188 |
> hg ci -qm "added "$ch; |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
189 |
> done; |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
190 |
|
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
191 |
$ hg glog |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
192 |
@ 4:c41c793e0ef1 added d |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
193 |
| () [default] draft |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
194 |
o 3:ca1b80f7960a added c |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
195 |
| () [default] draft |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
196 |
o 2:b1661037fa25 added b |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
197 |
| () [default] draft |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
198 |
o 1:c7586e2a9264 added a |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
199 |
| () [default] draft |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
200 |
o 0:8fa14d15e168 added hgignore |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
201 |
() [default] draft |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
202 |
|
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
203 |
$ cd .. |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
204 |
$ hg init stackrepo2 |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
205 |
$ cd stackrepo2 |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
206 |
$ hg pull ../stackrepo1 |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
207 |
pulling from ../stackrepo1 |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
208 |
requesting all changes |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
209 |
adding changesets |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
210 |
adding manifests |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
211 |
adding file changes |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
212 |
added 5 changesets with 5 changes to 5 files |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
213 |
new changesets 8fa14d15e168:c41c793e0ef1 (5 drafts) |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
214 |
(run 'hg update' to get a working copy) |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
215 |
|
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
216 |
$ hg glog |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
217 |
o 4:c41c793e0ef1 added d |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
218 |
| () [default] draft |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
219 |
o 3:ca1b80f7960a added c |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
220 |
| () [default] draft |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
221 |
o 2:b1661037fa25 added b |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
222 |
| () [default] draft |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
223 |
o 1:c7586e2a9264 added a |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
224 |
| () [default] draft |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
225 |
o 0:8fa14d15e168 added hgignore |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
226 |
() [default] draft |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
227 |
|
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
228 |
$ hg up 8fa14d15e168 |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
229 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
230 |
$ echo newfile > newfile |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
231 |
$ hg ci -Am "add newfile" |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
232 |
adding newfile |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
233 |
created new head |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
234 |
$ hg rebase -s c7586e2a9264 -d . |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
235 |
rebasing 1:c7586e2a9264 "added a" |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
236 |
rebasing 2:b1661037fa25 "added b" |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
237 |
rebasing 3:ca1b80f7960a "added c" |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
238 |
rebasing 4:c41c793e0ef1 "added d" |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
239 |
|
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
240 |
$ hg glog |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
241 |
o 9:d45f050514c2 added d |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
242 |
| () [default] draft |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
243 |
o 8:8ed612937375 added c |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
244 |
| () [default] draft |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
245 |
o 7:6eb54b5af3fb added b |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
246 |
| () [default] draft |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
247 |
o 6:c04ff147ef79 added a |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
248 |
| () [default] draft |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
249 |
@ 5:2228e3b74514 add newfile |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
250 |
| () [default] draft |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
251 |
o 0:8fa14d15e168 added hgignore |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
252 |
() [default] draft |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
253 |
|
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
254 |
$ cd ../stackrepo1 |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
255 |
$ hg up .^^^ |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
256 |
0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
257 |
$ echo wat > a |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
258 |
$ hg amend -m "watbar to a" |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
259 |
3 new orphan changesets |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
260 |
$ hg evolve --all |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
261 |
move:[2] added b |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
262 |
atop:[5] watbar to a |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
263 |
move:[3] added c |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
264 |
move:[4] added d |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
265 |
|
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
266 |
$ hg glog |
4577
bcd52ce0916d
evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
4490
diff
changeset
|
267 |
o 8:c72d2885eb51 added d |
4441
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
268 |
| () [default] draft |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
269 |
o 7:3ce4be6d8e5e added c |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
270 |
| () [default] draft |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
271 |
o 6:d5f148423c16 added b |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
272 |
| () [default] draft |
4577
bcd52ce0916d
evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
4490
diff
changeset
|
273 |
@ 5:8e222f257bbf watbar to a |
4441
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
274 |
| () [default] draft |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
275 |
o 0:8fa14d15e168 added hgignore |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
276 |
() [default] draft |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
277 |
|
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
278 |
$ hg pull ../stackrepo2 |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
279 |
pulling from ../stackrepo2 |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
280 |
searching for changes |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
281 |
adding changesets |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
282 |
adding manifests |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
283 |
adding file changes |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
284 |
added 5 changesets with 1 changes to 5 files (+1 heads) |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
285 |
4 new obsolescence markers |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
286 |
8 new content-divergent changesets |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
287 |
new changesets 2228e3b74514:d45f050514c2 (5 drafts) |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
288 |
(run 'hg heads' to see heads, 'hg merge' to merge) |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
289 |
|
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
290 |
$ hg glog |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
291 |
* 13:d45f050514c2 added d |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
292 |
| () [default] draft |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
293 |
* 12:8ed612937375 added c |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
294 |
| () [default] draft |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
295 |
* 11:6eb54b5af3fb added b |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
296 |
| () [default] draft |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
297 |
* 10:c04ff147ef79 added a |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
298 |
| () [default] draft |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
299 |
o 9:2228e3b74514 add newfile |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
300 |
| () [default] draft |
4577
bcd52ce0916d
evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
4490
diff
changeset
|
301 |
| * 8:c72d2885eb51 added d |
4441
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
302 |
| | () [default] draft |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
303 |
| * 7:3ce4be6d8e5e added c |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
304 |
| | () [default] draft |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
305 |
| * 6:d5f148423c16 added b |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
306 |
| | () [default] draft |
4577
bcd52ce0916d
evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
4490
diff
changeset
|
307 |
| @ 5:8e222f257bbf watbar to a |
4441
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
308 |
|/ () [default] draft |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
309 |
o 0:8fa14d15e168 added hgignore |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
310 |
() [default] draft |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
311 |
|
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
312 |
$ hg evolve --all --content-divergent |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
313 |
merge:[10] added a |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
314 |
with: [5] watbar to a |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
315 |
base: [1] added a |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
316 |
rebasing "other" content-divergent changeset 8e222f257bbf on 2228e3b74514 |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
317 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
4442
819bad275701
evolve: add logic to handle a particular case in divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4441
diff
changeset
|
318 |
merge:[11] added b |
819bad275701
evolve: add logic to handle a particular case in divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4441
diff
changeset
|
319 |
with: [6] added b |
4441
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
320 |
base: [2] added b |
4991
2928f35023a1
evolve: make sure divergence resolution doesn't undo changes (issue6203)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4990
diff
changeset
|
321 |
rebasing "divergent" content-divergent changeset 6eb54b5af3fb on 74fbf3e6a0b6 |
2928f35023a1
evolve: make sure divergence resolution doesn't undo changes (issue6203)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4990
diff
changeset
|
322 |
rebasing "other" content-divergent changeset d5f148423c16 on 74fbf3e6a0b6 |
4442
819bad275701
evolve: add logic to handle a particular case in divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4441
diff
changeset
|
323 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
819bad275701
evolve: add logic to handle a particular case in divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4441
diff
changeset
|
324 |
merge:[12] added c |
819bad275701
evolve: add logic to handle a particular case in divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4441
diff
changeset
|
325 |
with: [7] added c |
4441
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
326 |
base: [3] added c |
4991
2928f35023a1
evolve: make sure divergence resolution doesn't undo changes (issue6203)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4990
diff
changeset
|
327 |
rebasing "divergent" content-divergent changeset 8ed612937375 on 4e29776e83a5 |
2928f35023a1
evolve: make sure divergence resolution doesn't undo changes (issue6203)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4990
diff
changeset
|
328 |
rebasing "other" content-divergent changeset 3ce4be6d8e5e on 4e29776e83a5 |
4442
819bad275701
evolve: add logic to handle a particular case in divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4441
diff
changeset
|
329 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
819bad275701
evolve: add logic to handle a particular case in divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4441
diff
changeset
|
330 |
merge:[13] added d |
819bad275701
evolve: add logic to handle a particular case in divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4441
diff
changeset
|
331 |
with: [8] added d |
4441
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
332 |
base: [4] added d |
4991
2928f35023a1
evolve: make sure divergence resolution doesn't undo changes (issue6203)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4990
diff
changeset
|
333 |
rebasing "divergent" content-divergent changeset d45f050514c2 on 77126af93a25 |
2928f35023a1
evolve: make sure divergence resolution doesn't undo changes (issue6203)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4990
diff
changeset
|
334 |
rebasing "other" content-divergent changeset c72d2885eb51 on 77126af93a25 |
4442
819bad275701
evolve: add logic to handle a particular case in divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4441
diff
changeset
|
335 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
4577
bcd52ce0916d
evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
4490
diff
changeset
|
336 |
working directory is now at 74fbf3e6a0b6 |
4441
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
337 |
|
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
338 |
$ hg glog |
4991
2928f35023a1
evolve: make sure divergence resolution doesn't undo changes (issue6203)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4990
diff
changeset
|
339 |
o 24:c8f73c376a6e added d |
4441
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
340 |
| () [default] draft |
4991
2928f35023a1
evolve: make sure divergence resolution doesn't undo changes (issue6203)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4990
diff
changeset
|
341 |
o 21:77126af93a25 added c |
4441
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
342 |
| () [default] draft |
4991
2928f35023a1
evolve: make sure divergence resolution doesn't undo changes (issue6203)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4990
diff
changeset
|
343 |
o 18:4e29776e83a5 added b |
4441
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
344 |
| () [default] draft |
4577
bcd52ce0916d
evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
4490
diff
changeset
|
345 |
@ 15:74fbf3e6a0b6 watbar to a |
4441
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
346 |
| () [default] draft |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
347 |
o 9:2228e3b74514 add newfile |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
348 |
| () [default] draft |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
349 |
o 0:8fa14d15e168 added hgignore |
f606eab8dff8
evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4428
diff
changeset
|
350 |
() [default] draft |
4419
1fdecdfd0df9
evolve: add test which shows unrecoverable evolve state (issue6053)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4181
diff
changeset
|
351 |
$ cd .. |
4990
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
352 |
|
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
353 |
Make sure that content-divergent resolution doesn't undo a change (issue6203) |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
354 |
----------------------------------------------------------------------------- |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
355 |
|
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
356 |
$ hg init issue6203 |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
357 |
$ cd issue6203 |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
358 |
$ echo a > a; hg add a; hg ci -m a |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
359 |
$ echo 'b with typo' > b; hg add b; hg ci -m b |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
360 |
$ echo c > c; hg add c; hg ci -m c |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
361 |
|
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
362 |
$ hg prev |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
363 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
364 |
[1] b |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
365 |
$ echo 'b without typo' > b |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
366 |
$ hg amend |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
367 |
1 new orphan changesets |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
368 |
$ hg evolve |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
369 |
move:[2] c |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
370 |
atop:[3] b |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
371 |
|
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
372 |
$ hg up 0 |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
373 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
374 |
$ echo d > d; hg add d; hg ci -m d |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
375 |
created new head |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
376 |
$ hg rebase --hidden --config experimental.evolution.allowdivergence=True -s 1 -d 5 |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
377 |
rebasing 1:d420a663b65e "b" |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
378 |
rebasing 2:49f182e7a6cc "c" |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
379 |
4 new content-divergent changesets |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
380 |
$ hg log -G -v --patch |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
381 |
* changeset: 7:ef4885dea3da |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
382 |
| tag: tip |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
383 |
| user: test |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
384 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
385 |
| instability: content-divergent |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
386 |
| files: c |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
387 |
| description: |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
388 |
| c |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
389 |
| |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
390 |
| |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
391 |
| diff -r fe788ccf5416 -r ef4885dea3da c |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
392 |
| --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
393 |
| +++ b/c Thu Jan 01 00:00:00 1970 +0000 |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
394 |
| @@ -0,0 +1,1 @@ |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
395 |
| +c |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
396 |
| |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
397 |
* changeset: 6:fe788ccf5416 |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
398 |
| user: test |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
399 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
400 |
| instability: content-divergent |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
401 |
| files: b |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
402 |
| description: |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
403 |
| b |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
404 |
| |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
405 |
| |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
406 |
| diff -r 980f7dc84c29 -r fe788ccf5416 b |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
407 |
| --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
408 |
| +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
409 |
| @@ -0,0 +1,1 @@ |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
410 |
| +b with typo |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
411 |
| |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
412 |
@ changeset: 5:980f7dc84c29 |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
413 |
| parent: 0:cb9a9f314b8b |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
414 |
| user: test |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
415 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
416 |
| files: d |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
417 |
| description: |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
418 |
| d |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
419 |
| |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
420 |
| |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
421 |
| diff -r cb9a9f314b8b -r 980f7dc84c29 d |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
422 |
| --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
423 |
| +++ b/d Thu Jan 01 00:00:00 1970 +0000 |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
424 |
| @@ -0,0 +1,1 @@ |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
425 |
| +d |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
426 |
| |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
427 |
| * changeset: 4:fef59171875e |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
428 |
| | user: test |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
429 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
430 |
| | instability: content-divergent |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
431 |
| | files: c |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
432 |
| | description: |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
433 |
| | c |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
434 |
| | |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
435 |
| | |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
436 |
| | diff -r 5b2d00df9c4e -r fef59171875e c |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
437 |
| | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
438 |
| | +++ b/c Thu Jan 01 00:00:00 1970 +0000 |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
439 |
| | @@ -0,0 +1,1 @@ |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
440 |
| | +c |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
441 |
| | |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
442 |
| * changeset: 3:5b2d00df9c4e |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
443 |
|/ parent: 0:cb9a9f314b8b |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
444 |
| user: test |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
445 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
446 |
| instability: content-divergent |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
447 |
| files: b |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
448 |
| description: |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
449 |
| b |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
450 |
| |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
451 |
| |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
452 |
| diff -r cb9a9f314b8b -r 5b2d00df9c4e b |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
453 |
| --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
454 |
| +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
455 |
| @@ -0,0 +1,1 @@ |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
456 |
| +b without typo |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
457 |
| |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
458 |
o changeset: 0:cb9a9f314b8b |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
459 |
user: test |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
460 |
date: Thu Jan 01 00:00:00 1970 +0000 |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
461 |
files: a |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
462 |
description: |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
463 |
a |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
464 |
|
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
465 |
|
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
466 |
diff -r 000000000000 -r cb9a9f314b8b a |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
467 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
468 |
+++ b/a Thu Jan 01 00:00:00 1970 +0000 |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
469 |
@@ -0,0 +1,1 @@ |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
470 |
+a |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
471 |
|
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
472 |
|
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
473 |
$ hg evolve --content-divergent |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
474 |
merge:[6] b |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
475 |
with: [3] b |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
476 |
base: [1] b |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
477 |
rebasing "other" content-divergent changeset 5b2d00df9c4e on 980f7dc84c29 |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
478 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
479 |
merge:[7] c |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
480 |
with: [4] c |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
481 |
base: [2] c |
4991
2928f35023a1
evolve: make sure divergence resolution doesn't undo changes (issue6203)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4990
diff
changeset
|
482 |
rebasing "divergent" content-divergent changeset ef4885dea3da on 0999c349998d |
2928f35023a1
evolve: make sure divergence resolution doesn't undo changes (issue6203)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4990
diff
changeset
|
483 |
rebasing "other" content-divergent changeset fef59171875e on 0999c349998d |
4990
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
484 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
485 |
|
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
486 |
Expected result: |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
487 |
Changeset with description "b" only adds file "b" with content "b without typo". |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
488 |
Changeset with description "c" only adds file "c" with content "c". |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
489 |
|
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
490 |
$ hg glog -l2 -p |
4991
2928f35023a1
evolve: make sure divergence resolution doesn't undo changes (issue6203)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4990
diff
changeset
|
491 |
o 12:4ca627f76da9 c |
2928f35023a1
evolve: make sure divergence resolution doesn't undo changes (issue6203)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4990
diff
changeset
|
492 |
| () [default] draftdiff -r 0999c349998d -r 4ca627f76da9 c |
4990
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
493 |
| --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
494 |
| +++ b/c Thu Jan 01 00:00:00 1970 +0000 |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
495 |
| @@ -0,0 +1,1 @@ |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
496 |
| +c |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
497 |
| |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
498 |
o 9:0999c349998d b |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
499 |
| () [default] draftdiff -r 980f7dc84c29 -r 0999c349998d b |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
500 |
~ --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
501 |
+++ b/b Thu Jan 01 00:00:00 1970 +0000 |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
502 |
@@ -0,0 +1,1 @@ |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
503 |
+b without typo |
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
504 |
|
f3fd3c1c3da0
evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
505 |
$ cd .. |
4993
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
506 |
|
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
507 |
Testing case when resolution parent is ambiguous (MultipleSuccessorsError) |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
508 |
-------------------------------------------------------------------------- |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
509 |
|
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
510 |
$ hg init multiplesuccs1 |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
511 |
$ cd multiplesuccs1 |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
512 |
$ echo base > base |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
513 |
$ hg ci -Aqm "added base" |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
514 |
$ echo foo > foo |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
515 |
$ hg ci -Aqm "added foo" |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
516 |
$ echo bar > bar; echo car > car |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
517 |
$ hg ci -Aqm "added bar and car" |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
518 |
$ echo dar > dar |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
519 |
$ hg ci -Aqm "added dar" |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
520 |
|
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
521 |
$ cd .. |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
522 |
$ hg clone multiplesuccs1 multiplesuccs2 |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
523 |
updating to branch default |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
524 |
5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
525 |
$ cd multiplesuccs2 |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
526 |
$ hg up -r "desc('added foo')" |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
527 |
0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
528 |
$ echo newfoo > foo |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
529 |
$ hg amend |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
530 |
2 new orphan changesets |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
531 |
$ hg evolve |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
532 |
move:[2] added bar and car |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
533 |
atop:[4] added foo |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
534 |
move:[3] added dar |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
535 |
|
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
536 |
$ cd ../multiplesuccs1 |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
537 |
$ hg up -r "desc('added base')" |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
538 |
0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
539 |
$ echo tuna > tuna |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
540 |
$ hg ci -Aqm "added tuna" |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
541 |
$ hg rebase -s "desc('added foo')" -d . |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
542 |
rebasing 1:8da7bbaea4f7 "added foo" |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
543 |
rebasing 2:7f4b97b13607 "added bar and car" |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
544 |
rebasing 3:9f12b2fcb3de "added dar" |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
545 |
|
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
546 |
$ cd ../multiplesuccs2 |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
547 |
$ hg pull |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
548 |
pulling from $TESTTMP/multiplesuccs1 |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
549 |
searching for changes |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
550 |
adding changesets |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
551 |
adding manifests |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
552 |
adding file changes |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
553 |
added 4 changesets with 1 changes to 5 files (+1 heads) |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
554 |
3 new obsolescence markers |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
555 |
6 new content-divergent changesets |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
556 |
new changesets 9703820a7d5b:9a1f460df8b5 (4 drafts) |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
557 |
(run 'hg heads' to see heads, 'hg merge' to merge) |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
558 |
$ hg glog |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
559 |
* 10:9a1f460df8b5 added dar |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
560 |
| () [default] draft |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
561 |
* 9:7dd5b9d42ef3 added bar and car |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
562 |
| () [default] draft |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
563 |
* 8:afd8b2ea1b77 added foo |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
564 |
| () [default] draft |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
565 |
o 7:9703820a7d5b added tuna |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
566 |
| () [default] draft |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
567 |
| * 6:57a3f8edf065 added dar |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
568 |
| | () [default] draft |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
569 |
| * 5:f4ed107810a7 added bar and car |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
570 |
| | () [default] draft |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
571 |
| @ 4:8a2d93492f59 added foo |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
572 |
|/ () [default] draft |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
573 |
o 0:bde1d2b6b5e5 added base |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
574 |
() [default] draft |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
575 |
|
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
576 |
$ hg evolve -r 4+5 --content-divergent |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
577 |
merge:[8] added foo |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
578 |
with: [4] added foo |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
579 |
base: [1] added foo |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
580 |
rebasing "other" content-divergent changeset 8a2d93492f59 on 9703820a7d5b |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
581 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
582 |
merge:[9] added bar and car |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
583 |
with: [5] added bar and car |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
584 |
base: [2] added bar and car |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
585 |
rebasing "divergent" content-divergent changeset 7dd5b9d42ef3 on 8ef6ad88580d |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
586 |
rebasing "other" content-divergent changeset f4ed107810a7 on 8ef6ad88580d |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
587 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
588 |
2 new orphan changesets |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
589 |
working directory is now at 8ef6ad88580d |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
590 |
|
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
591 |
$ hg glog |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
592 |
o 15:09ba686a465e added bar and car |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
593 |
| () [default] draft |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
594 |
@ 12:8ef6ad88580d added foo |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
595 |
| () [default] draft |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
596 |
| * 10:9a1f460df8b5 added dar |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
597 |
| | () [default] draft |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
598 |
| x 9:7dd5b9d42ef3 added bar and car |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
599 |
| | () [default] draft |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
600 |
| x 8:afd8b2ea1b77 added foo |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
601 |
|/ () [default] draft |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
602 |
o 7:9703820a7d5b added tuna |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
603 |
| () [default] draft |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
604 |
| * 6:57a3f8edf065 added dar |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
605 |
| | () [default] draft |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
606 |
| x 5:f4ed107810a7 added bar and car |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
607 |
| | () [default] draft |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
608 |
| x 4:8a2d93492f59 added foo |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
609 |
|/ () [default] draft |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
610 |
o 0:bde1d2b6b5e5 added base |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
611 |
() [default] draft |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
612 |
|
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
613 |
$ echo bar > bar; hg ci -Aqm "added bar" |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
614 |
$ echo car > car; hg ci -Aqm "added car" |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
615 |
$ hg prune --split -s 16+17 -r 15 |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
616 |
1 changesets pruned |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
617 |
|
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
618 |
$ hg evolve --content-divergent |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
619 |
skipping 57a3f8edf065: have a different parent than 9a1f460df8b5 (not handled yet) |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
620 |
| 57a3f8edf065, 9a1f460df8b5 are not based on the same changeset. |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
621 |
| With the current state of its implementation, |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
622 |
| evolve does not work in that case. |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
623 |
| rebase one of them next to the other and run |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
624 |
| this command again. |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
625 |
| - either: hg rebase --dest 'p1(57a3f8edf065)' -r 9a1f460df8b5 |
e0b5ce458af5
evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4991
diff
changeset
|
626 |
| - or: hg rebase --dest 'p1(9a1f460df8b5)' -r 57a3f8edf065 |