[PATCH] merge: improve clarity of table in update docstring
Augie Fackler
raf at durin42.com
Fri Oct 23 10:06:49 UTC 2015
# HG changeset patch
# User Augie Fackler <augie at google.com>
# Date 1445594782 14400
# Fri Oct 23 06:06:22 2015 -0400
# Branch stable
# Node ID 27683c63f44cb58d02df2d4dc16f5ba3348d394c
# Parent 71d5238f92e9ab5cc6b1677d4ba48903fc939f01
merge: improve clarity of table in update docstring
diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -1116,15 +1116,15 @@ def update(repo, node, branchmerge, forc
This logic is tested by test-update-branches.t.
- -c -C dirty rev | linear same cross
- n n n n | ok (1) x
- n n n y | ok ok ok
- n n y n | merge (2) (2)
- n n y y | merge (3) (3)
- n y * * | --- discard ---
- y n y * | --- (4) ---
- y n n * | --- ok ---
- y y * * | --- (5) ---
+ -c -C dirty rev | linear same cross
+ n n n n | ok (1) x
+ n n n y | ok ok ok
+ n n y n | merge (2) (2)
+ n n y y | merge (3) (3)
+ n y * * | discard discard discard
+ y n y * | (4) (4) (4)
+ y n n * | ok ok ok
+ y y * * | (5) (5) (5)
x = can't happen
* = don't-care
More information about the Mercurial-devel
mailing list