Patchwork [04,of,11,V5] merge: move "incompatible options" case first in docstring table

login
register
mail settings
Submitter via Mercurial-devel
Date Feb. 28, 2017, 12:31 a.m.
Message ID <658aa233506c722935c6.1488241881@martinvonz.mtv.corp.google.com>
Download mbox | patch
Permalink /patch/18822/
State Accepted
Headers show

Comments

via Mercurial-devel - Feb. 28, 2017, 12:31 a.m.
# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1488236413 28800
#      Mon Feb 27 15:00:13 2017 -0800
# Node ID 658aa233506c722935c640eb3b46fc2176f5df58
# Parent  4287db2a458cd9497c5273bb129d4e32798fabc1
merge: move "incompatible options" case first in docstring table

Patch

diff -r 4287db2a458c -r 658aa233506c mercurial/merge.py
--- a/mercurial/merge.py	Mon Feb 27 14:58:53 2017 -0800
+++ b/mercurial/merge.py	Mon Feb 27 15:00:13 2017 -0800
@@ -1469,23 +1469,23 @@ 
     This logic is tested by test-update-branches.t.
 
     -c  -C  dirty  rev  linear  |  result
+     y   y    *     *     *     |    (1)
      n   n    n     n     n     |     x
      n   n    n     n     y     |    ok
      n   n    n     y     *     |    ok
      n   n    y     n     n     |     x
      n   n    y     n     y     |   merge
-     n   n    y     y     n     |    (1)
+     n   n    y     y     n     |    (2)
      n   n    y     y     y     |   merge
      n   y    *     *     *     |  discard
-     y   n    y     *     *     |    (2)
+     y   n    y     *     *     |    (3)
      y   n    n     *     *     |    ok
-     y   y    *     *     *     |    (3)
 
     x = can't happen
     * = don't-care
-    1 = abort: uncommitted changes (commit or update --clean to discard changes)
-    2 = abort: uncommitted changes (checked in commands.py)
-    3 = incompatible options (checked in commands.py)
+    1 = incompatible options (checked in commands.py)
+    2 = abort: uncommitted changes (commit or update --clean to discard changes)
+    3 = abort: uncommitted changes (checked in commands.py)
 
     Return the same tuple as applyupdates().
     """