Patchwork merge: improve clarity of table in update docstring

login
register
mail settings
Submitter Augie Fackler
Date Oct. 23, 2015, 10:06 a.m.
Message ID <27683c63f44cb58d02df.1445594809@augie-macbookair2.roam.corp.google.com>
Download mbox | patch
Permalink /patch/11218/
State Accepted
Headers show

Comments

Augie Fackler - Oct. 23, 2015, 10:06 a.m.
# HG changeset patch
# User Augie Fackler <augie@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
Matt Mackall - Oct. 23, 2015, 2:02 p.m.
On Fri, 2015-10-23 at 06:06 -0400, Augie Fackler wrote:
> # HG changeset patch
> # User Augie Fackler <augie@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

Queued for stable, thanks.

-- 
Mathematics is the supreme nostalgia of our time.

Patch

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