equal
deleted
inserted
replaced
1467 the parent rev to the target rev (linear or not). |
1467 the parent rev to the target rev (linear or not). |
1468 |
1468 |
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 n n n n n | x |
1473 n n n n n | x |
1473 n n n n y | ok |
1474 n n n n y | ok |
1474 n n n y * | ok |
1475 n n n y * | ok |
1475 n n y n n | x |
1476 n n y n n | x |
1476 n n y n y | merge |
1477 n n y n y | merge |
1477 n n y y n | (1) |
1478 n n y y n | (2) |
1478 n n y y y | merge |
1479 n n y y y | merge |
1479 n y * * * | discard |
1480 n y * * * | discard |
1480 y n y * * | (2) |
1481 y n y * * | (3) |
1481 y n n * * | ok |
1482 y n n * * | ok |
1482 y y * * * | (3) |
|
1483 |
1483 |
1484 x = can't happen |
1484 x = can't happen |
1485 * = don't-care |
1485 * = don't-care |
1486 1 = abort: uncommitted changes (commit or update --clean to discard changes) |
1486 1 = incompatible options (checked in commands.py) |
1487 2 = abort: uncommitted changes (checked in commands.py) |
1487 2 = abort: uncommitted changes (commit or update --clean to discard changes) |
1488 3 = incompatible options (checked in commands.py) |
1488 3 = abort: uncommitted changes (checked in commands.py) |
1489 |
1489 |
1490 Return the same tuple as applyupdates(). |
1490 Return the same tuple as applyupdates(). |
1491 """ |
1491 """ |
1492 |
1492 |
1493 # This functon used to find the default destination if node was None, but |
1493 # This functon used to find the default destination if node was None, but |