Mercurial > hg-stable
changeset 31173:f21a77fe7637
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 |
| files | mercurial/merge.py |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/merge.py Mon Feb 27 15:02:36 2017 -0800 +++ b/mercurial/merge.py Mon Feb 27 15:29:34 2017 -0800 @@ -1464,13 +1464,13 @@ 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 or not). + the parent rev to the target rev (linear or not). Match from top first. This logic is tested by test-update-branches.t. -c -C dirty rev linear | result y y * * * | (1) - n n * n n | x + * * * n n | x n n n n y | ok n n n y * | ok n n y n y | merge