Mercurial > hg
changeset 31159:955b3a6d3dd5
merge: drop redundant column in docstring table
The "same" and "cross" columns now have the same values, so let's
combine them into "non-linear".
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 27 Feb 2017 14:33:17 -0800 |
| parents | 58f55f0b40dc |
| children | 487ec7b096e2 |
| files | mercurial/merge.py |
| diffstat | 1 files changed, 10 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/merge.py Mon Feb 27 14:27:22 2017 -0800 +++ b/mercurial/merge.py Mon Feb 27 14:33:17 2017 -0800 @@ -1464,20 +1464,19 @@ The table below shows all the behaviors of the update command given the -c and -C or no options, whether the working directory is dirty, whether a revision is specified, and the relationship of - the parent rev to the target rev (linear, on the same named - branch, or on another named branch). + the parent rev to the target rev (linear or not). This logic is tested by test-update-branches.t. - -c -C dirty rev | linear same cross - n n n n | ok x x - n n n y | ok ok ok - n n y n | merge x x - n n y y | merge (1) (1) - n y * * | discard discard discard - y n y * | (2) (2) (2) - y n n * | ok ok ok - y y * * | (3) (3) (3) + -c -C dirty rev | linear non-linear + n n n n | ok x + n n n y | ok ok + n n y n | merge x + n n y y | merge (1) + n y * * | discard discard + y n y * | (2) (2) + y n n * | ok ok + y y * * | (3) (3) x = can't happen * = don't-care