# HG changeset patch # User FUJIWARA Katsunori <foozy@lares.dti.ne.jp> # Date 2013-09-30 15:12:34 # Node ID e7c0e5f81367b386befc2ed6714933113d05b307 # Parent 44d7bfe08c14bd389d18b8bfd3d5687809ad3f62 histedit: add more detailed help about "--outgoing" diff --git a/hgext/histedit.py b/hgext/histedit.py --- a/hgext/histedit.py +++ b/hgext/histedit.py @@ -462,6 +462,15 @@ def histedit(ui, repo, *freeargs, **opts With --outgoing, this edits changesets not found in the destination repository. If URL of the destination is omitted, the 'default-push' (or 'default') path will be used. + + For safety, this command is aborted, also if there are ambiguous + outgoing revisions which may confuse users: for example, there are + multiple branches containing outgoing revisions. + + Use "min(outgoing() and ::.)" or similar revset specification + instead of --outgoing to specify edit target revision exactly in + such ambiguous situation. See :hg:`help revsets` for detail about + selecting revisions. """ # TODO only abort if we try and histedit mq patches, not just # blanket if mq patches are applied somewhere