Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 31158:58f55f0b40dc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: drop obsolete non-linear cases from docstring table Since 6b1fc09c699a (update: change default destination to tipmost descendant (issue4673) (BC), 2016-02-02), non-linear updates can no longer happen if the user doesn't specify a destination, so we can drop these case from the table in the docstring of merge.update().
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 27 Feb 2017 14:27:22 -0800
parents 330fbd515512
children 955b3a6d3dd5
comparison
equal deleted inserted replaced
31157:accdd5e62066 31158:58f55f0b40dc
1468 branch, or on another named branch). 1468 branch, or on another named branch).
1469 1469
1470 This logic is tested by test-update-branches.t. 1470 This logic is tested by test-update-branches.t.
1471 1471
1472 -c -C dirty rev | linear same cross 1472 -c -C dirty rev | linear same cross
1473 n n n n | ok (1) x 1473 n n n n | ok x x
1474 n n n y | ok ok ok 1474 n n n y | ok ok ok
1475 n n y n | merge (2) (2) 1475 n n y n | merge x x
1476 n n y y | merge (3) (3) 1476 n n y y | merge (1) (1)
1477 n y * * | discard discard discard 1477 n y * * | discard discard discard
1478 y n y * | (4) (4) (4) 1478 y n y * | (2) (2) (2)
1479 y n n * | ok ok ok 1479 y n n * | ok ok ok
1480 y y * * | (5) (5) (5) 1480 y y * * | (3) (3) (3)
1481 1481
1482 x = can't happen 1482 x = can't happen
1483 * = don't-care 1483 * = don't-care
1484 1 = abort: not a linear update (merge or update --check to force update) 1484 1 = abort: uncommitted changes (commit or update --clean to discard changes)
1485 2 = abort: uncommitted changes (commit and merge, or update --clean to 1485 2 = abort: uncommitted changes (checked in commands.py)
1486 discard changes) 1486 3 = incompatible options (checked in commands.py)
1487 3 = abort: uncommitted changes (commit or update --clean to discard changes)
1488 4 = abort: uncommitted changes (checked in commands.py)
1489 5 = incompatible options (checked in commands.py)
1490 1487
1491 Return the same tuple as applyupdates(). 1488 Return the same tuple as applyupdates().
1492 """ 1489 """
1493 1490
1494 # This functon used to find the default destination if node was None, but 1491 # This functon used to find the default destination if node was None, but