equal
deleted
inserted
replaced
1469 This logic is tested by test-update-branches.t. |
1469 This logic is tested by test-update-branches.t. |
1470 |
1470 |
1471 -c -C dirty rev linear | result |
1471 -c -C dirty rev linear | result |
1472 y y * * * | (1) |
1472 y y * * * | (1) |
1473 * * * n n | x |
1473 * * * n n | x |
1474 n n n n y | ok |
1474 * * n * * | ok |
1475 n n n y * | ok |
|
1476 n n y n y | merge |
1475 n n y n y | merge |
1477 n n y y n | (2) |
1476 n n y y n | (2) |
1478 n n y y y | merge |
1477 n n y y y | merge |
1479 n y * * * | discard |
1478 n y y * * | discard |
1480 y n y * * | (3) |
1479 y n y * * | (3) |
1481 y n n * * | ok |
|
1482 |
1480 |
1483 x = can't happen |
1481 x = can't happen |
1484 * = don't-care |
1482 * = don't-care |
1485 1 = incompatible options (checked in commands.py) |
1483 1 = incompatible options (checked in commands.py) |
1486 2 = abort: uncommitted changes (commit or update --clean to discard changes) |
1484 2 = abort: uncommitted changes (commit or update --clean to discard changes) |