facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-09 08:18:15 +03:00
Code Issues Projects Releases Wiki Activity

merge: move "incompatible options" case first in docstring table

Browse Source
This commit is contained in:
Martin von Zweigbergk 2017-02-27 15:00:13 -08:00
parent a3d141c00e
commit 2b1e4cc1c6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mercurial/merge.py
View File

@ -1469,23 +1469,23 @@ def update(repo, node, branchmerge, force, ancestor=None,
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().
"""