Mercurial > public > mercurial-scm > hg
diff mercurial/merge.py @ 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 | 9e7e24052745 |
children | 6bf39d88c857 |
line wrap: on
line diff
--- 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