38 $ hg ci -Aqm "added b" |
38 $ hg ci -Aqm "added b" |
39 |
39 |
40 $ hg up .^ |
40 $ hg up .^ |
41 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
41 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
42 $ echo bdivergent > bdivergent1 |
42 $ echo bdivergent > bdivergent1 |
43 $ hg ci -Am "divergent1" |
43 $ hg ci -Am "divergent" |
44 adding bdivergent1 |
44 adding bdivergent1 |
45 created new head |
45 created new head |
46 |
46 |
47 $ hg up .^ |
47 $ hg up .^ |
48 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
48 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
49 $ echo bdivergent > bdivergent2 |
49 $ echo bdivergent > bdivergent2 |
50 $ hg ci -Am "divergent2" |
50 $ hg ci -Am "divergent" |
51 adding bdivergent2 |
51 adding bdivergent2 |
52 created new head |
52 created new head |
53 |
53 |
54 $ hg prune -s "desc(divergent1)" "desc('added b')" |
54 $ hg prune -s 8374d2ddc3a4 "desc('added b')" |
55 1 changesets pruned |
55 1 changesets pruned |
56 $ hg prune -s "desc(divergent2)" "desc('added b')" --hidden |
56 $ hg prune -s 593c57f2117e "desc('added b')" --hidden |
57 1 changesets pruned |
57 1 changesets pruned |
58 2 new content-divergent changesets |
58 2 new content-divergent changesets |
59 |
59 |
60 $ hg log -G |
60 $ hg log -G |
61 @ 3:527aaa00354a@default(draft) divergent2 [content-divergent] |
61 @ 3:8374d2ddc3a4@default(draft) divergent [content-divergent] |
62 | |
62 | |
63 | * 2:e97948280e0f@default(draft) divergent1 [content-divergent] |
63 | * 2:593c57f2117e@default(draft) divergent [content-divergent] |
64 |/ |
64 |/ |
65 o 0:9092f1db7931@default(draft) added a [] |
65 o 0:9092f1db7931@default(draft) added a [] |
66 |
66 |
67 |
67 |
68 $ hg evolve --all --any --content-divergent |
68 $ hg evolve --all --any --content-divergent |
69 merge:[2] divergent1 |
69 merge:[2] divergent |
70 with: [3] divergent2 |
70 with: [3] divergent |
71 base: [1] added b |
71 base: [1] added b |
72 updating to "local" side of the conflict: e97948280e0f |
72 updating to "local" side of the conflict: 593c57f2117e |
73 merging "other" content-divergent changeset '527aaa00354a' |
73 merging "other" content-divergent changeset '8374d2ddc3a4' |
74 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
74 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
75 working directory is now at bcd04eb3c8c5 |
75 working directory is now at d52878315036 |
76 $ hg log -G |
76 $ hg log -G |
77 @ 4:bcd04eb3c8c5@default(draft) divergent1 [] |
77 @ 4:d52878315036@default(draft) divergent [] |
78 | |
78 | |
79 o 0:9092f1db7931@default(draft) added a [] |
79 o 0:9092f1db7931@default(draft) added a [] |
80 |
80 |
81 Test divergence resolution when it yields to an empty commit (issue4950) |
81 Test divergence resolution when it yields to an empty commit (issue4950) |
82 cdivergent2 contains the same content than cdivergent1 and they are divergent |
82 cdivergent2 contains the same content than cdivergent1 and they are divergent |
94 |
94 |
95 $ hg up .^ |
95 $ hg up .^ |
96 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
96 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
97 $ echo "cdivergent1" > cdivergent1 |
97 $ echo "cdivergent1" > cdivergent1 |
98 $ hg add cdivergent1 |
98 $ hg add cdivergent1 |
99 $ hg ci -m "cdivergent2" |
99 $ hg ci -m "add _c" |
100 created new head |
100 created new head |
101 |
101 |
102 $ hg prune -s "desc(cdivergent1)" "desc(_c)" |
102 $ hg log -G |
103 1 changesets pruned |
103 @ 7:b2ae71172042@default(draft) add _c [] |
104 $ hg prune -s "desc(cdivergent2)" "desc(_c)" --hidden |
104 | |
|
105 | o 6:e3ff64ce8d4c@default(draft) add cdivergent1 [] |
|
106 |/ |
|
107 | o 5:48819a835615@default(draft) add _c [] |
|
108 |/ |
|
109 | o 4:d52878315036@default(draft) divergent [] |
|
110 |/ |
|
111 o 0:9092f1db7931@default(draft) added a [] |
|
112 |
|
113 |
|
114 $ hg prune -s b2ae71172042 48819a835615 |
|
115 1 changesets pruned |
|
116 $ hg prune -s e3ff64ce8d4c 48819a835615 --hidden |
105 1 changesets pruned |
117 1 changesets pruned |
106 2 new content-divergent changesets |
118 2 new content-divergent changesets |
107 |
119 |
108 $ hg log -G |
120 $ hg log -G |
109 @ 7:8debdf3c1fbd@default(draft) cdivergent2 [content-divergent] |
121 @ 7:b2ae71172042@default(draft) add _c [content-divergent] |
110 | |
122 | |
111 | * 6:e3ff64ce8d4c@default(draft) add cdivergent1 [content-divergent] |
123 | * 6:e3ff64ce8d4c@default(draft) add cdivergent1 [content-divergent] |
112 |/ |
124 |/ |
113 | o 4:bcd04eb3c8c5@default(draft) divergent1 [] |
125 | o 4:d52878315036@default(draft) divergent [] |
114 |/ |
126 |/ |
115 o 0:9092f1db7931@default(draft) added a [] |
127 o 0:9092f1db7931@default(draft) added a [] |
116 |
128 |
117 $ hg evolve --all --any --content-divergent |
129 $ hg evolve --all --any --content-divergent |
118 merge:[6] add cdivergent1 |
130 merge:[6] add cdivergent1 |
119 with: [7] cdivergent2 |
131 with: [7] add _c |
120 base: [5] add _c |
132 base: [5] add _c |
121 updating to "local" side of the conflict: e3ff64ce8d4c |
133 updating to "local" side of the conflict: e3ff64ce8d4c |
122 merging "other" content-divergent changeset '8debdf3c1fbd' |
134 merging "other" content-divergent changeset 'b2ae71172042' |
123 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
135 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
124 nothing changed |
136 nothing changed |
125 working directory is now at e3ff64ce8d4c |
137 working directory is now at e3ff64ce8d4c |
126 |
138 |
127 $ cd .. |
139 $ cd .. |
133 $ mkcommits _a _b |
145 $ mkcommits _a _b |
134 |
146 |
135 $ hg up .^ |
147 $ hg up .^ |
136 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
148 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
137 $ echo bdivergent > bdivergent11 |
149 $ echo bdivergent > bdivergent11 |
138 $ hg ci -Am "bdivergent11" |
150 $ hg ci -Am "bdivergent" |
139 adding bdivergent11 |
151 adding bdivergent11 |
140 created new head |
152 created new head |
141 |
153 |
142 $ hg up .^ |
154 $ hg up .^ |
143 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
155 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
144 $ echo bdivergent > bdivergent22 |
156 $ echo bdivergent > bdivergent22 |
145 $ hg ci -Am "bdivergent22" |
157 $ hg ci -Am "bdivergent" |
146 adding bdivergent22 |
158 adding bdivergent22 |
147 created new head |
159 created new head |
148 |
160 |
149 $ hg prune -s "desc(bdivergent11)" "desc(_b)" |
161 $ hg log -G |
150 1 changesets pruned |
162 @ 3:6b096fb45070@default(draft) bdivergent [] |
151 $ hg prune -s "desc(bdivergent22)" "desc(_b)" --hidden |
163 | |
|
164 | o 2:05a6b6a9e633@default(draft) bdivergent [] |
|
165 |/ |
|
166 | o 1:37445b16603b@default(draft) add _b [] |
|
167 |/ |
|
168 o 0:135f39f4bd78@default(draft) add _a [] |
|
169 |
|
170 |
|
171 $ hg prune -s 6b096fb45070 37445b16603b |
|
172 1 changesets pruned |
|
173 $ hg prune -s 05a6b6a9e633 37445b16603b --hidden |
152 1 changesets pruned |
174 1 changesets pruned |
153 2 new content-divergent changesets |
175 2 new content-divergent changesets |
154 $ hg log -G |
176 $ hg log -G |
155 @ 3:31e50386b33b@default(draft) bdivergent22 [content-divergent] |
177 @ 3:6b096fb45070@default(draft) bdivergent [content-divergent] |
156 | |
178 | |
157 | * 2:4bcc9397dfb9@default(draft) bdivergent11 [content-divergent] |
179 | * 2:05a6b6a9e633@default(draft) bdivergent [content-divergent] |
158 |/ |
180 |/ |
159 o 0:135f39f4bd78@default(draft) add _a [] |
181 o 0:135f39f4bd78@default(draft) add _a [] |
160 |
182 |
161 |
183 |
162 $ cat >$TESTTMP/test_extension.py << EOF |
184 $ cat >$TESTTMP/test_extension.py << EOF |
173 $ hg evolve --all |
195 $ hg evolve --all |
174 nothing to evolve on current working copy parent |
196 nothing to evolve on current working copy parent |
175 (do you want to use --content-divergent) |
197 (do you want to use --content-divergent) |
176 [2] |
198 [2] |
177 $ hg evolve --content-divergent |
199 $ hg evolve --content-divergent |
178 merge:[3] bdivergent22 |
200 merge:[3] bdivergent |
179 with: [2] bdivergent11 |
201 with: [2] bdivergent |
180 base: [1] add _b |
202 base: [1] add _b |
181 merging "other" content-divergent changeset '4bcc9397dfb9' |
203 merging "other" content-divergent changeset '05a6b6a9e633' |
182 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
204 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
183 working directory is now at 1a7876768e59 |
205 working directory is now at 1155f059af3f |
184 |
206 |
185 $ cd .. |
207 $ cd .. |