[PATCH 1 of 2 STABLE] backout: document return code of merge conflict
Yuya Nishihara
yuya at tcha.org
Sat Mar 8 05:40:11 CST 2014
# HG changeset patch
# User Yuya Nishihara <yuya at tcha.org>
# Date 1394271716 -32400
# Sat Mar 08 18:41:56 2014 +0900
# Branch stable
# Node ID 734580066b4ec44a59cfe307ebc7999f9425c23b
# Parent 2d183dd5438450e465785b2204e406ed48e6d5f8
backout: document return code of merge conflict
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -416,7 +416,7 @@ def backout(ui, repo, node=None, rev=Non
See :hg:`help dates` for a list of formats valid for -d/--date.
- Returns 0 on success.
+ Returns 0 on success, 1 if there are unresolved files.
'''
if rev and node:
raise util.Abort(_("please specify just one revision"))
More information about the Mercurial-devel
mailing list