Show More
@@ -185,18 +185,20 b' merging with unrelated change does not i' | |||||
185 | - rename on one side |
|
185 | - rename on one side | |
186 | - unrelated change on the other side |
|
186 | - unrelated change on the other side | |
187 |
|
187 | |||
|
188 | $ case_desc="simple merge" | |||
|
189 | ||||
188 | $ hg up 'desc("b-1")' |
|
190 | $ hg up 'desc("b-1")' | |
189 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
191 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
190 | $ hg merge 'desc("a-2")' |
|
192 | $ hg merge 'desc("a-2")' | |
191 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
193 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
192 | (branch merge, don't forget to commit) |
|
194 | (branch merge, don't forget to commit) | |
193 |
$ hg ci -m |
|
195 | $ hg ci -m "mBAm-0 $case_desc - one way" | |
194 | $ hg up 'desc("a-2")' |
|
196 | $ hg up 'desc("a-2")' | |
195 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
197 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
196 | $ hg merge 'desc("b-1")' |
|
198 | $ hg merge 'desc("b-1")' | |
197 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
199 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
198 | (branch merge, don't forget to commit) |
|
200 | (branch merge, don't forget to commit) | |
199 |
$ hg ci -m |
|
201 | $ hg ci -m "mABm-0 $case_desc - the other way" | |
200 | created new head |
|
202 | created new head | |
201 | $ hg log -G --rev '::(desc("mABm")+desc("mBAm"))' |
|
203 | $ hg log -G --rev '::(desc("mABm")+desc("mBAm"))' | |
202 | @ 12 mABm-0 simple merge - the other way |
|
204 | @ 12 mABm-0 simple merge - the other way | |
@@ -225,12 +227,14 b' case summary:' | |||||
225 | - one deleting the change |
|
227 | - one deleting the change | |
226 | and recreate an unrelated file after the merge |
|
228 | and recreate an unrelated file after the merge | |
227 |
|
229 | |||
|
230 | $ case_desc="simple merge" | |||
|
231 | ||||
228 | $ hg up 'desc("b-1")' |
|
232 | $ hg up 'desc("b-1")' | |
229 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
233 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
230 | $ hg merge 'desc("c-1")' |
|
234 | $ hg merge 'desc("c-1")' | |
231 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
235 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
232 | (branch merge, don't forget to commit) |
|
236 | (branch merge, don't forget to commit) | |
233 |
$ hg ci -m |
|
237 | $ hg ci -m "mBCm-0 $case_desc - one way" | |
234 | $ echo bar > d |
|
238 | $ echo bar > d | |
235 | $ hg add d |
|
239 | $ hg add d | |
236 | $ hg ci -m 'mBCm-1 re-add d' |
|
240 | $ hg ci -m 'mBCm-1 re-add d' | |
@@ -239,7 +243,7 b' and recreate an unrelated file after the' | |||||
239 | $ hg merge 'desc("b-1")' |
|
243 | $ hg merge 'desc("b-1")' | |
240 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
244 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
241 | (branch merge, don't forget to commit) |
|
245 | (branch merge, don't forget to commit) | |
242 |
$ hg ci -m |
|
246 | $ hg ci -m "mCBm-0 $case_desc - the other way" | |
243 | created new head |
|
247 | created new head | |
244 | $ echo bar > d |
|
248 | $ echo bar > d | |
245 | $ hg add d |
|
249 | $ hg add d | |
@@ -271,18 +275,20 b' Merge:' | |||||
271 | - one with change to an unrelated file |
|
275 | - one with change to an unrelated file | |
272 | - one deleting and recreating the change |
|
276 | - one deleting and recreating the change | |
273 |
|
277 | |||
|
278 | $ case_desc="simple merge" | |||
|
279 | ||||
274 | $ hg up 'desc("b-1")' |
|
280 | $ hg up 'desc("b-1")' | |
275 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
281 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
276 | $ hg merge 'desc("d-2")' |
|
282 | $ hg merge 'desc("d-2")' | |
277 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
283 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
278 | (branch merge, don't forget to commit) |
|
284 | (branch merge, don't forget to commit) | |
279 |
$ hg ci -m |
|
285 | $ hg ci -m "mBDm-0 $case_desc - one way" | |
280 | $ hg up 'desc("d-2")' |
|
286 | $ hg up 'desc("d-2")' | |
281 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
287 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
282 | $ hg merge 'desc("b-1")' |
|
288 | $ hg merge 'desc("b-1")' | |
283 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
289 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
284 | (branch merge, don't forget to commit) |
|
290 | (branch merge, don't forget to commit) | |
285 |
$ hg ci -m |
|
291 | $ hg ci -m "mDBm-0 $case_desc - the other way" | |
286 | created new head |
|
292 | created new head | |
287 | $ hg log -G --rev '::(desc("mDBm")+desc("mBDm"))' |
|
293 | $ hg log -G --rev '::(desc("mDBm")+desc("mBDm"))' | |
288 | @ 18 mDBm-0 simple merge - the other way |
|
294 | @ 18 mDBm-0 simple merge - the other way | |
@@ -309,13 +315,15 b' Comparing with a merge with colliding re' | |||||
309 | - the "e-" branch renaming b to f (through 'g') |
|
315 | - the "e-" branch renaming b to f (through 'g') | |
310 | - the "a-" branch renaming d to f (through e) |
|
316 | - the "a-" branch renaming d to f (through e) | |
311 |
|
317 | |||
|
318 | $ case_desc="simple merge" | |||
|
319 | ||||
312 | $ hg up 'desc("a-2")' |
|
320 | $ hg up 'desc("a-2")' | |
313 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
321 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
314 | $ hg merge 'desc("e-2")' |
|
322 | $ hg merge 'desc("e-2")' | |
315 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved (no-changeset !) |
|
323 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved (no-changeset !) | |
316 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved (changeset !) |
|
324 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved (changeset !) | |
317 | (branch merge, don't forget to commit) |
|
325 | (branch merge, don't forget to commit) | |
318 |
$ hg ci -m |
|
326 | $ hg ci -m "mAEm-0 $case_desc - one way" | |
319 | $ hg up 'desc("e-2")' |
|
327 | $ hg up 'desc("e-2")' | |
320 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-changeset !) |
|
328 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-changeset !) | |
321 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (changeset !) |
|
329 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (changeset !) | |
@@ -323,7 +331,7 b' Comparing with a merge with colliding re' | |||||
323 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved (no-changeset !) |
|
331 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved (no-changeset !) | |
324 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved (changeset !) |
|
332 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved (changeset !) | |
325 | (branch merge, don't forget to commit) |
|
333 | (branch merge, don't forget to commit) | |
326 |
$ hg ci -m |
|
334 | $ hg ci -m "mEAm-0 $case_desc - the other way" | |
327 | created new head |
|
335 | created new head | |
328 | $ hg log -G --rev '::(desc("mAEm")+desc("mEAm"))' |
|
336 | $ hg log -G --rev '::(desc("mAEm")+desc("mEAm"))' | |
329 | @ 20 mEAm-0 simple merge - the other way |
|
337 | @ 20 mEAm-0 simple merge - the other way | |
@@ -350,6 +358,8 b' Merge:' | |||||
350 | - one with change to an unrelated file (b) |
|
358 | - one with change to an unrelated file (b) | |
351 | - one overwriting a file (d) with a rename (from h to i to d) |
|
359 | - one overwriting a file (d) with a rename (from h to i to d) | |
352 |
|
360 | |||
|
361 | $ case_desc="simple merge" | |||
|
362 | ||||
353 | $ hg up 'desc("i-2")' |
|
363 | $ hg up 'desc("i-2")' | |
354 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
364 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
355 | $ hg mv h i |
|
365 | $ hg mv h i | |
@@ -370,13 +380,13 b' Merge:' | |||||
370 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved (no-changeset !) |
|
380 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved (no-changeset !) | |
371 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved (changeset !) |
|
381 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved (changeset !) | |
372 | (branch merge, don't forget to commit) |
|
382 | (branch merge, don't forget to commit) | |
373 |
$ hg ci -m |
|
383 | $ hg ci -m "mBFm-0 $case_desc - one way" | |
374 | $ hg up 'desc("f-2")' |
|
384 | $ hg up 'desc("f-2")' | |
375 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
385 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
376 | $ hg merge 'desc("b-1")' |
|
386 | $ hg merge 'desc("b-1")' | |
377 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
387 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
378 | (branch merge, don't forget to commit) |
|
388 | (branch merge, don't forget to commit) | |
379 |
$ hg ci -m |
|
389 | $ hg ci -m "mFBm-0 $case_desc - the other way" | |
380 | created new head |
|
390 | created new head | |
381 | $ hg log -G --rev '::(desc("mBFm")+desc("mFBm"))' |
|
391 | $ hg log -G --rev '::(desc("mBFm")+desc("mFBm"))' | |
382 | @ 24 mFBm-0 simple merge - the other way |
|
392 | @ 24 mFBm-0 simple merge - the other way | |
@@ -404,6 +414,8 b' Merge:' | |||||
404 | Unlike in the 'BD/DB' cases, an actual merge happened here. So we should |
|
414 | Unlike in the 'BD/DB' cases, an actual merge happened here. So we should | |
405 | consider history and rename on both branch of the merge. |
|
415 | consider history and rename on both branch of the merge. | |
406 |
|
416 | |||
|
417 | $ case_desc="simple merge" | |||
|
418 | ||||
407 | $ hg up 'desc("i-2")' |
|
419 | $ hg up 'desc("i-2")' | |
408 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-changeset !) |
|
420 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-changeset !) | |
409 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved (changeset !) |
|
421 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved (changeset !) | |
@@ -416,14 +428,14 b' consider history and rename on both bran' | |||||
416 | merging d |
|
428 | merging d | |
417 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
429 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
418 | (branch merge, don't forget to commit) |
|
430 | (branch merge, don't forget to commit) | |
419 |
$ hg ci -m |
|
431 | $ hg ci -m "mDGm-0 $case_desc - one way" | |
420 | $ hg up 'desc("g-1")' |
|
432 | $ hg up 'desc("g-1")' | |
421 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
433 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
422 | $ hg merge 'desc("d-2")' --tool :union |
|
434 | $ hg merge 'desc("d-2")' --tool :union | |
423 | merging d |
|
435 | merging d | |
424 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
436 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
425 | (branch merge, don't forget to commit) |
|
437 | (branch merge, don't forget to commit) | |
426 |
$ hg ci -m |
|
438 | $ hg ci -m "mGDm-0 $case_desc - the other way" | |
427 | created new head |
|
439 | created new head | |
428 | $ hg log -G --rev '::(desc("mDGm")+desc("mGDm"))' |
|
440 | $ hg log -G --rev '::(desc("mDGm")+desc("mGDm"))' | |
429 | @ 27 mGDm-0 simple merge - the other way |
|
441 | @ 27 mGDm-0 simple merge - the other way | |
@@ -457,6 +469,8 b' Note:' | |||||
457 | | |
|
469 | | | |
458 | | The current code arbitrarily pick one side |
|
470 | | The current code arbitrarily pick one side | |
459 |
|
471 | |||
|
472 | $ case_desc="simple merge" | |||
|
473 | ||||
460 | $ hg up 'desc("f-2")' |
|
474 | $ hg up 'desc("f-2")' | |
461 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
475 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
462 | $ hg merge 'desc("g-1")' --tool :union |
|
476 | $ hg merge 'desc("g-1")' --tool :union | |
@@ -464,7 +478,7 b' Note:' | |||||
464 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (no-changeset !) |
|
478 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (no-changeset !) | |
465 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (changeset !) |
|
479 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (changeset !) | |
466 | (branch merge, don't forget to commit) |
|
480 | (branch merge, don't forget to commit) | |
467 |
$ hg ci -m |
|
481 | $ hg ci -m "mFGm-0 $case_desc - one way" | |
468 | created new head |
|
482 | created new head | |
469 | $ hg up 'desc("g-1")' |
|
483 | $ hg up 'desc("g-1")' | |
470 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-changeset !) |
|
484 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-changeset !) | |
@@ -474,7 +488,7 b' Note:' | |||||
474 | 0 files updated, 1 files merged, 1 files removed, 0 files unresolved (no-changeset !) |
|
488 | 0 files updated, 1 files merged, 1 files removed, 0 files unresolved (no-changeset !) | |
475 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved (changeset !) |
|
489 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved (changeset !) | |
476 | (branch merge, don't forget to commit) |
|
490 | (branch merge, don't forget to commit) | |
477 |
$ hg ci -m |
|
491 | $ hg ci -m "mGFm-0 $case_desc - the other way" | |
478 | created new head |
|
492 | created new head | |
479 | $ hg log -G --rev '::(desc("mGFm")+desc("mFGm"))' |
|
493 | $ hg log -G --rev '::(desc("mGFm")+desc("mFGm"))' | |
480 | @ 29 mGFm-0 simple merge - the other way |
|
494 | @ 29 mGFm-0 simple merge - the other way |
General Comments 0
You need to be logged in to leave comments.
Login now