Patchwork [1,of,2,STABLE] rebase: add description about exit code when there are unresolved conflicts

login
register
mail settings
Submitter Katsunori FUJIWARA
Date Oct. 26, 2013, 3:41 p.m.
Message ID <ce74c20e699eaeeb2e0b.1382802108@juju>
Download mbox | patch
Permalink /patch/2825/
State Accepted
Commit 2a9bb64faa0b26be8dee1604f770f8921c5013fe
Headers show

Comments

Katsunori FUJIWARA - Oct. 26, 2013, 3:41 p.m.
# HG changeset patch
# User FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
# Date 1382801065 -32400
#      Sun Oct 27 00:24:25 2013 +0900
# Branch stable
# Node ID ce74c20e699eaeeb2e0bf0767dd5a1f8d9e8326a
# Parent  1d7a36ff2615e6e12ce65681db4e07622e7b60d1
rebase: add description about exit code when there are unresolved conflicts

Patch

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -128,7 +128,8 @@ 
     If a rebase is interrupted to manually resolve a merge, it can be
     continued with --continue/-c or aborted with --abort/-a.
 
-    Returns 0 on success, 1 if nothing to rebase.
+    Returns 0 on success, 1 if nothing to rebase or there are
+    unresolved conflicts.
     """
     originalwd = target = None
     activebookmark = None