Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/merge.py @ 31173:f21a77fe7637

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: clarify non-linear default updates in docstring table Non-linear updates won't happen by default, regardless of -c/-C.
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 27 Feb 2017 15:29:34 -0800
parents e72ed22713ab
children b94706a4e267
comparison
equal deleted inserted replaced
31172:e72ed22713ab 31173:f21a77fe7637
1462 this is True, then 'force' should be True as well. 1462 this is True, then 'force' should be True as well.
1463 1463
1464 The table below shows all the behaviors of the update command 1464 The table below shows all the behaviors of the update command
1465 given the -c and -C or no options, whether the working directory 1465 given the -c and -C or no options, whether the working directory
1466 is dirty, whether a revision is specified, and the relationship of 1466 is dirty, whether a revision is specified, and the relationship of
1467 the parent rev to the target rev (linear or not). 1467 the parent rev to the target rev (linear or not). Match from top first.
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 y y * * * | (1)
1473 n n * n n | x 1473 * * * n n | x
1474 n n n n y | ok 1474 n n n n y | ok
1475 n n n y * | ok 1475 n n n y * | ok
1476 n n y n y | merge 1476 n n y n y | merge
1477 n n y y n | (2) 1477 n n y y n | (2)
1478 n n y y y | merge 1478 n n y y y | merge