Mercurial > hg-stable
changeset 13162:115a9760c382
merge: document some internal return values.
| author | Greg Ward <greg-hg@gerg.ca> |
|---|---|
| date | Mon, 13 Dec 2010 11:46:31 -0500 |
| parents | 11eb53464e68 |
| children | b75fc70f0a9f |
| files | mercurial/hg.py mercurial/merge.py |
| diffstat | 2 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/hg.py Thu Dec 16 14:50:37 2010 -0600 +++ b/mercurial/hg.py Mon Dec 13 11:46:31 2010 -0500 @@ -395,7 +395,8 @@ return stats[3] > 0 def merge(repo, node, force=None, remind=True): - """branch merge with node, resolving changes""" + """Branch merge with node, resolving changes. Return true if any + unresolved conflicts.""" stats = mergemod.update(repo, node, True, force, False) _showstats(repo, stats) if stats[3]:
--- a/mercurial/merge.py Thu Dec 16 14:50:37 2010 -0600 +++ b/mercurial/merge.py Mon Dec 13 11:46:31 2010 -0500 @@ -255,6 +255,9 @@ wctx is the working copy context mctx is the context to be merged into the working copy actx is the context of the common ancestor + + Return a tuple of counts (updated, merged, removed, unresolved) that + describes how many files were affected by the update. """ updated, merged, removed, unresolved = 0, 0, 0, 0 @@ -462,6 +465,8 @@ use 'hg update -C' to discard changes) 3 = abort: uncommitted local changes 4 = incompatible options (checked in commands.py) + + Return the same tuple as applyupdates(). """ onode = node