[PATCH 06 of 11 V5] merge: clarify non-linear default updates in docstring table
Martin von Zweigbergk
martinvonz at google.com
Mon Feb 27 19:31:23 EST 2017
# HG changeset patch
# User Martin von Zweigbergk <martinvonz at google.com>
# Date 1488238174 28800
# Mon Feb 27 15:29:34 2017 -0800
# Node ID 5fe59a06b365dcb9c399ffbb0b64d985b53f2745
# Parent e1f1afc6f1c31748077da2abe2a7b613eef17914
merge: clarify non-linear default updates in docstring table
Non-linear updates won't happen by default, regardless of -c/-C.
diff -r e1f1afc6f1c3 -r 5fe59a06b365 mercurial/merge.py
--- 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
More information about the Mercurial-devel
mailing list