Show More
@@ -469,7 +469,7 b' Note:' | |||||
469 | | |
|
469 | | | |
470 | | The current code arbitrarily pick one side |
|
470 | | The current code arbitrarily pick one side | |
471 |
|
471 | |||
472 | $ case_desc="simple merge" |
|
472 | $ case_desc="merge - G side: content change, F side: copy overwrite, no content change" | |
473 |
|
473 | |||
474 | $ hg up 'desc("f-2")' |
|
474 | $ hg up 'desc("f-2")' | |
475 | 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 | |
@@ -491,9 +491,9 b' Note:' | |||||
491 | $ hg ci -m "mGFm-0 $case_desc - the other way" |
|
491 | $ hg ci -m "mGFm-0 $case_desc - the other way" | |
492 | created new head |
|
492 | created new head | |
493 | $ hg log -G --rev '::(desc("mGFm")+desc("mFGm"))' |
|
493 | $ hg log -G --rev '::(desc("mGFm")+desc("mFGm"))' | |
494 | @ 29 mGFm-0 simple merge - the other way |
|
494 | @ 29 mGFm-0 merge - G side: content change, F side: copy overwrite, no content change - the other way | |
495 | |\ |
|
495 | |\ | |
496 | +---o 28 mFGm-0 simple merge - one way |
|
496 | +---o 28 mFGm-0 merge - G side: content change, F side: copy overwrite, no content change - one way | |
497 | | |/ |
|
497 | | |/ | |
498 | | o 25 g-1: update d |
|
498 | | o 25 g-1: update d | |
499 | | | |
|
499 | | | | |
@@ -699,10 +699,10 b' Summary of all created cases' | |||||
699 | mDGm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - one way |
|
699 | mDGm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - one way | |
700 | mEAm-0 merge with copies info on both side - A side: rename d to f, E side: b to f, (same content for f) - the other way |
|
700 | mEAm-0 merge with copies info on both side - A side: rename d to f, E side: b to f, (same content for f) - the other way | |
701 | mFBm-0 simple merge - the other way |
|
701 | mFBm-0 simple merge - the other way | |
702 | mFGm-0 simple merge - one way |
|
702 | mFGm-0 merge - G side: content change, F side: copy overwrite, no content change - one way | |
703 | mGCm-0 |
|
703 | mGCm-0 | |
704 | mGDm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - the other way |
|
704 | mGDm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - the other way | |
705 | mGFm-0 simple merge - the other way |
|
705 | mGFm-0 merge - G side: content change, F side: copy overwrite, no content change - the other way | |
706 | mHC-delete-before-conflict-m-0 |
|
706 | mHC-delete-before-conflict-m-0 | |
707 |
|
707 | |||
708 |
|
708 | |||
@@ -1441,7 +1441,7 b' revision numbers)' | |||||
1441 |
|
1441 | |||
1442 | #if no-changeset |
|
1442 | #if no-changeset | |
1443 | $ hg log -Gfr 'desc("mDGm-0")' d |
|
1443 | $ hg log -Gfr 'desc("mDGm-0")' d | |
1444 | o 26 mDGm-0 simple merge - one way |
|
1444 | o 26 mDGm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - one way | |
1445 | |\ |
|
1445 | |\ | |
1446 | | o 25 g-1: update d |
|
1446 | | o 25 g-1: update d | |
1447 | | | |
|
1447 | | | | |
@@ -1470,7 +1470,7 b' BROKEN: `hg log --follow <file>` relies ' | |||||
1470 |
|
1470 | |||
1471 | #if no-changeset |
|
1471 | #if no-changeset | |
1472 | $ hg log -Gfr 'desc("mDGm-0")' d |
|
1472 | $ hg log -Gfr 'desc("mDGm-0")' d | |
1473 | o 26 mDGm-0 simple merge - one way |
|
1473 | o 26 mDGm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - one way | |
1474 | |\ |
|
1474 | |\ | |
1475 | | o 25 g-1: update d |
|
1475 | | o 25 g-1: update d | |
1476 | | | |
|
1476 | | | | |
@@ -1506,9 +1506,9 b' history are relevant.' | |||||
1506 |
|
1506 | |||
1507 |
|
1507 | |||
1508 | $ hg log -G --rev '::(desc("mGFm")+desc("mFGm"))' |
|
1508 | $ hg log -G --rev '::(desc("mGFm")+desc("mFGm"))' | |
1509 | o 29 mGFm-0 simple merge - the other way |
|
1509 | o 29 mGFm-0 merge - G side: content change, F side: copy overwrite, no content change - the other way | |
1510 | |\ |
|
1510 | |\ | |
1511 | +---o 28 mFGm-0 simple merge - one way |
|
1511 | +---o 28 mFGm-0 merge - G side: content change, F side: copy overwrite, no content change - one way | |
1512 | | |/ |
|
1512 | | |/ | |
1513 | | o 25 g-1: update d |
|
1513 | | o 25 g-1: update d | |
1514 | | | |
|
1514 | | | | |
@@ -1584,7 +1584,7 b' Copy tracing data on the resulting merge' | |||||
1584 |
|
1584 | |||
1585 | #if no-changeset |
|
1585 | #if no-changeset | |
1586 | $ hg log -Gfr 'desc("mFGm-0")' d |
|
1586 | $ hg log -Gfr 'desc("mFGm-0")' d | |
1587 | o 28 mFGm-0 simple merge - one way |
|
1587 | o 28 mFGm-0 merge - G side: content change, F side: copy overwrite, no content change - one way | |
1588 | |\ |
|
1588 | |\ | |
1589 | | o 25 g-1: update d |
|
1589 | | o 25 g-1: update d | |
1590 | | | |
|
1590 | | | | |
@@ -1610,7 +1610,7 b' BROKEN: `hg log --follow <file>` relies ' | |||||
1610 |
|
1610 | |||
1611 | #if no-changeset |
|
1611 | #if no-changeset | |
1612 | $ hg log -Gfr 'desc("mGFm-0")' d |
|
1612 | $ hg log -Gfr 'desc("mGFm-0")' d | |
1613 | o 29 mGFm-0 simple merge - the other way |
|
1613 | o 29 mGFm-0 merge - G side: content change, F side: copy overwrite, no content change - the other way | |
1614 | |\ |
|
1614 | |\ | |
1615 | | o 25 g-1: update d |
|
1615 | | o 25 g-1: update d | |
1616 | | | |
|
1616 | | | |
General Comments 0
You need to be logged in to leave comments.
Login now