Mercurial > hg

comparison hgext/rebase.py @ 19971:2a9bb64faa0b stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: add description about exit code when there are unresolved conflicts
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Sun, 27 Oct 2013 00:24:25 +0900
parents ad9db007656f
children 7d5e7799a29f
comparison
equal deleted inserted replaced
19970:065e6f1c9259 19971:2a9bb64faa0b
126 the intended source branch). 126 the intended source branch).
127 127
128 If a rebase is interrupted to manually resolve a merge, it can be 128 If a rebase is interrupted to manually resolve a merge, it can be
129 continued with --continue/-c or aborted with --abort/-a. 129 continued with --continue/-c or aborted with --abort/-a.
130 130
131 Returns 0 on success, 1 if nothing to rebase. 131 Returns 0 on success, 1 if nothing to rebase or there are
132 unresolved conflicts.
132 """ 133 """
133 originalwd = target = None 134 originalwd = target = None
134 activebookmark = None 135 activebookmark = None
135 external = nullrev 136 external = nullrev
136 state = {} 137 state = {}