# HG changeset patch # User FUJIWARA Katsunori # Date 1382801065 -32400 # Node ID 1e13a5a9c66e24348be9d9b684cbf38c5a848087 # Parent 2a9bb64faa0b26be8dee1604f770f8921c5013fe histedit: add description about exit code diff -r 2a9bb64faa0b -r 1e13a5a9c66e hgext/histedit.py --- a/hgext/histedit.py Sun Oct 27 00:24:25 2013 +0900 +++ b/hgext/histedit.py Sun Oct 27 00:24:25 2013 +0900 @@ -471,6 +471,10 @@ instead of --outgoing to specify edit target revision exactly in such ambiguous situation. See :hg:`help revsets` for detail about selecting revisions. + + Returns 0 on success, 1 if user intervention is required (not only + for intentional "edit" command, but also for resolving unexpected + conflicts). """ # TODO only abort if we try and histedit mq patches, not just # blanket if mq patches are applied somewhere