77 $ hg evolve --all --any --content-divergent --update |
77 $ hg evolve --all --any --content-divergent --update |
78 merge:[2] divergent |
78 merge:[2] divergent |
79 with: [3] divergent |
79 with: [3] divergent |
80 base: [1] added b |
80 base: [1] added b |
81 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
81 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
82 working directory is now at 45bf1312f454 |
82 working directory is now at 98ab969ac8fb |
83 $ hg log -G |
83 $ hg log -G |
84 @ 4:45bf1312f454@default(draft) divergent [] |
84 @ 4:98ab969ac8fb@default(draft) divergent [] |
85 | |
85 | |
86 o 0:9092f1db7931@default(draft) added a [] |
86 o 0:9092f1db7931@default(draft) added a [] |
87 |
87 |
|
88 $ hg debugobsolete |
|
89 5f6d8a4bf34ab274ccc9f631c2536964b8a3666d 8374d2ddc3a4d48428c3d2f80e4fc86f13736f96 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'} |
|
90 5f6d8a4bf34ab274ccc9f631c2536964b8a3666d 593c57f2117e33dd0884382f02789d948f548557 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'} |
|
91 593c57f2117e33dd0884382f02789d948f548557 98ab969ac8fbe315e6d2c24a8eb5eab5b81e4242 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'} |
|
92 8374d2ddc3a4d48428c3d2f80e4fc86f13736f96 98ab969ac8fbe315e6d2c24a8eb5eab5b81e4242 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'} |
|
93 $ hg obslog --all |
|
94 @ 98ab969ac8fb (4) divergent |
|
95 |\ amended(content) from 593c57f2117e using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
|
96 | | amended(content) from 8374d2ddc3a4 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
|
97 | | |
|
98 x | 593c57f2117e (2) divergent |
|
99 | | rewritten(description, content) from 5f6d8a4bf34a using prune by test (Thu Jan 01 00:00:00 1970 +0000) |
|
100 | | |
|
101 | x 8374d2ddc3a4 (3) divergent |
|
102 |/ rewritten(description, content) from 5f6d8a4bf34a using prune by test (Thu Jan 01 00:00:00 1970 +0000) |
|
103 | |
|
104 x 5f6d8a4bf34a (1) added b |
|
105 |
|
106 |
88 Test divergence resolution when it yields to an empty commit (issue4950) |
107 Test divergence resolution when it yields to an empty commit (issue4950) |
89 cdivergent2 contains the same content than cdivergent1 and they are divergent |
108 cdivergent2 contains the same content than cdivergent1 and they are divergent |
90 versions of the revision _c |
109 versions of the revision _c |
91 |
110 |
92 $ hg up .^ |
111 $ hg up .^ |
127 $ hg log -G |
146 $ hg log -G |
128 @ 7:b2ae71172042@default(draft) add _c [content-divergent] |
147 @ 7:b2ae71172042@default(draft) add _c [content-divergent] |
129 | |
148 | |
130 | * 6:e3ff64ce8d4c@default(draft) add cdivergent1 [content-divergent] |
149 | * 6:e3ff64ce8d4c@default(draft) add cdivergent1 [content-divergent] |
131 |/ |
150 |/ |
132 | o 4:45bf1312f454@default(draft) divergent [] |
151 | o 4:98ab969ac8fb@default(draft) divergent [] |
133 |/ |
152 |/ |
134 o 0:9092f1db7931@default(draft) added a [] |
153 o 0:9092f1db7931@default(draft) added a [] |
135 |
154 |
136 $ hg evolve --all --any --content-divergent |
155 $ hg evolve --all --any --content-divergent |
137 merge:[6] add cdivergent1 |
156 merge:[6] add cdivergent1 |
138 with: [7] add _c |
157 with: [7] add _c |
139 base: [5] add _c |
158 base: [5] add _c |
140 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
159 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
141 nothing changed |
160 working directory is now at 6b3776664a25 |
142 working directory is now at e3ff64ce8d4c |
161 |
|
162 $ hg log -G |
|
163 @ 8:6b3776664a25@default(draft) add cdivergent1 [] |
|
164 | |
|
165 | o 4:98ab969ac8fb@default(draft) divergent [] |
|
166 |/ |
|
167 o 0:9092f1db7931@default(draft) added a [] |
|
168 |
|
169 $ hg debugobsolete |
|
170 5f6d8a4bf34ab274ccc9f631c2536964b8a3666d 8374d2ddc3a4d48428c3d2f80e4fc86f13736f96 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'} |
|
171 5f6d8a4bf34ab274ccc9f631c2536964b8a3666d 593c57f2117e33dd0884382f02789d948f548557 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'} |
|
172 593c57f2117e33dd0884382f02789d948f548557 98ab969ac8fbe315e6d2c24a8eb5eab5b81e4242 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'} |
|
173 8374d2ddc3a4d48428c3d2f80e4fc86f13736f96 98ab969ac8fbe315e6d2c24a8eb5eab5b81e4242 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'} |
|
174 48819a83561596ef0aeac4082eaaa8afe4320f3a b2ae71172042972a8e8d2bc11e2b2fe4e0c3aa49 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'prune', 'user': 'test'} |
|
175 48819a83561596ef0aeac4082eaaa8afe4320f3a e3ff64ce8d4ce33b40d9f367a8ec472fec588ca3 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'} |
|
176 e3ff64ce8d4ce33b40d9f367a8ec472fec588ca3 6b3776664a258aa4c7e13f90df20ae9170995217 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'} |
|
177 b2ae71172042972a8e8d2bc11e2b2fe4e0c3aa49 6b3776664a258aa4c7e13f90df20ae9170995217 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'evolve', 'user': 'test'} |
|
178 $ hg obslog --all |
|
179 @ 6b3776664a25 (8) add cdivergent1 |
|
180 |\ reworded(description) from b2ae71172042 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
|
181 | | rewritten from e3ff64ce8d4c using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
|
182 | | |
|
183 x | b2ae71172042 (7) add _c |
|
184 | | amended(content) from 48819a835615 using prune by test (Thu Jan 01 00:00:00 1970 +0000) |
|
185 | | |
|
186 | x e3ff64ce8d4c (6) add cdivergent1 |
|
187 |/ rewritten(description, content) from 48819a835615 using prune by test (Thu Jan 01 00:00:00 1970 +0000) |
|
188 | |
|
189 x 48819a835615 (5) add _c |
|
190 |
143 |
191 |
144 $ cd .. |
192 $ cd .. |
145 |
193 |
146 Test None docstring issue of evolve divergent, which caused hg crush |
194 Test None docstring issue of evolve divergent, which caused hg crush |
147 |
195 |
204 $ hg evolve --content-divergent |
252 $ hg evolve --content-divergent |
205 merge:[2] bdivergent |
253 merge:[2] bdivergent |
206 with: [3] bdivergent |
254 with: [3] bdivergent |
207 base: [1] add _b |
255 base: [1] add _b |
208 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
256 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
209 working directory is now at 73ff357d3975 |
257 working directory is now at b87e0354d5cb |
|
258 |
|
259 $ hg log -G |
|
260 @ 4:b87e0354d5cb@default(draft) bdivergent [] |
|
261 | |
|
262 o 0:135f39f4bd78@default(draft) add _a [] |
|
263 |
|
264 $ hg debugobsolete |
|
265 37445b16603b50165d5eb80735fb986c72a2dac1 6b096fb450709a194b21fb9b192fe9b1572c4af0 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'} |
|
266 37445b16603b50165d5eb80735fb986c72a2dac1 05a6b6a9e633802d2bdd06e6d292982a767d930e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'} |
|
267 05a6b6a9e633802d2bdd06e6d292982a767d930e b87e0354d5cb081210298429d8b51de9871155a2 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'} |
|
268 6b096fb450709a194b21fb9b192fe9b1572c4af0 b87e0354d5cb081210298429d8b51de9871155a2 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'} |
|
269 $ hg obslog --all |
|
270 @ b87e0354d5cb (4) bdivergent |
|
271 |\ amended(content) from 05a6b6a9e633 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
|
272 | | amended(content) from 6b096fb45070 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
|
273 | | |
|
274 x | 05a6b6a9e633 (2) bdivergent |
|
275 | | rewritten(description, content) from 37445b16603b using prune by test (Thu Jan 01 00:00:00 1970 +0000) |
|
276 | | |
|
277 | x 6b096fb45070 (3) bdivergent |
|
278 |/ rewritten(description, content) from 37445b16603b using prune by test (Thu Jan 01 00:00:00 1970 +0000) |
|
279 | |
|
280 x 37445b16603b (1) add _b |
|
281 |
210 |
282 |
211 $ cd .. |
283 $ cd .. |
212 |
284 |
213 Test to make sure that evolve don't fall into unrecoverable state (issue6053) |
285 Test to make sure that evolve don't fall into unrecoverable state (issue6053) |
214 ------------------------------------------------------------------------------ |
286 ------------------------------------------------------------------------------ |
282 rebasing "other" content-divergent changeset de4ea3103326 on 155349b645be |
354 rebasing "other" content-divergent changeset de4ea3103326 on 155349b645be |
283 file 'd' was deleted in local but was modified in other. |
355 file 'd' was deleted in local but was modified in other. |
284 What do you want to do? |
356 What do you want to do? |
285 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c |
357 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c |
286 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
358 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
287 working directory is now at eb6357cd41b6 |
359 working directory is now at 51ee71efed61 |
288 |
360 |
289 $ hg glog -l1 |
361 $ hg glog -l1 |
290 @ 9:eb6357cd41b6 updated e |
362 @ 9:51ee71efed61 updated e |
291 | () [default] draft |
363 | () [default] draft |
292 ~ |
364 ~ |
|
365 |
|
366 $ hg debugobsolete |
|
367 8d71eadcc9dfb21a924e75a5796c2f011bdc55a4 ff6f7cd76a7c97d938e8fe87f0fc816b66929435 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'} |
|
368 8d71eadcc9dfb21a924e75a5796c2f011bdc55a4 de4ea3103326293994c634101e780724346ee89f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'} |
|
369 9150fe93bec603cd88d05cda9f6ff13420cb53e9 0 {155349b645beebee15325a9a22dd0c9ef8fbbbd3} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} |
|
370 ff6f7cd76a7c97d938e8fe87f0fc816b66929435 0ceb21ca2557a61433f097e4d64024e37cae2c10 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} |
|
371 de4ea3103326293994c634101e780724346ee89f a2465d1d56d1aee8ed90d2292978456d2be6f7b9 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} |
|
372 0ceb21ca2557a61433f097e4d64024e37cae2c10 51ee71efed6170064a7155a9a35e56af0292a203 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'} |
|
373 a2465d1d56d1aee8ed90d2292978456d2be6f7b9 51ee71efed6170064a7155a9a35e56af0292a203 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'} |
|
374 $ hg obslog --all |
|
375 @ 51ee71efed61 (9) updated e |
|
376 |\ amended(content) from 0ceb21ca2557 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
|
377 | | rewritten from a2465d1d56d1 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
|
378 | | |
|
379 x | 0ceb21ca2557 (7) updated e |
|
380 | | rebased(parent) from ff6f7cd76a7c using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
|
381 | | |
|
382 | x a2465d1d56d1 (8) updated e |
|
383 | | rebased(parent) from de4ea3103326 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
|
384 | | |
|
385 | x de4ea3103326 (6) updated e |
|
386 | | rewritten(description, parent, content) from 8d71eadcc9df using prune by test (Thu Jan 01 00:00:00 1970 +0000) |
|
387 | | |
|
388 x | ff6f7cd76a7c (5) updated e |
|
389 |/ rewritten(description, content) from 8d71eadcc9df using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
|
390 | |
|
391 x 8d71eadcc9df (4) added e |
|
392 |
293 |
393 |
294 $ cd .. |
394 $ cd .. |
295 |
395 |
296 Check that canceling of file deletion are merge correctly |
396 Check that canceling of file deletion are merge correctly |
297 --------------------------------------------------------- |
397 --------------------------------------------------------- |
339 $ hg evolve --content-divergent --update |
439 $ hg evolve --content-divergent --update |
340 merge:[2] delete a |
440 merge:[2] delete a |
341 with: [3] delete a |
441 with: [3] delete a |
342 base: [1] delete a |
442 base: [1] delete a |
343 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
443 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
344 working directory is now at 7ca6a9fafcf6 |
444 working directory is now at b1badc7ab394 |
345 $ hg glog |
445 $ hg glog |
346 @ 4:7ca6a9fafcf6 delete a |
446 @ 4:b1badc7ab394 delete a |
347 | () [default] draft |
447 | () [default] draft |
348 o 0:75d2b02c4a5c initial |
448 o 0:75d2b02c4a5c initial |
349 () [default] draft |
449 () [default] draft |
350 |
450 |
351 $ hg diff --change . |
451 $ hg diff --change . |
353 deleted file mode 100644 |
453 deleted file mode 100644 |
354 --- a/a |
454 --- a/a |
355 +++ /dev/null |
455 +++ /dev/null |
356 @@ -1,1 +0,0 @@ |
456 @@ -1,1 +0,0 @@ |
357 -a |
457 -a |
|
458 |
|
459 $ hg debugobsolete |
|
460 dff6e52f5e419381c070159c8038ac948f59283f 0825dcee2670349e749f1df45857fca34f61e350 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
|
461 dff6e52f5e419381c070159c8038ac948f59283f 92ecd58f9b05d6c0a1c3833a79359eea4b0268ff 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
|
462 0825dcee2670349e749f1df45857fca34f61e350 b1badc7ab394c2b9ed21e2961de43c71c2e2288f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'} |
|
463 92ecd58f9b05d6c0a1c3833a79359eea4b0268ff b1badc7ab394c2b9ed21e2961de43c71c2e2288f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'} |
|
464 $ hg obslog --all |
|
465 @ b1badc7ab394 (4) delete a |
|
466 |\ amended(content) from 0825dcee2670 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
|
467 | | amended(content) from 92ecd58f9b05 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
|
468 | | |
|
469 x | 0825dcee2670 (2) delete a |
|
470 | | amended(content) from dff6e52f5e41 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
|
471 | | |
|
472 | x 92ecd58f9b05 (3) delete a |
|
473 |/ amended(content) from dff6e52f5e41 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
|
474 | |
|
475 x dff6e52f5e41 (1) delete a |
|
476 |