Mercurial > hg

changeset 19842:1aaefba2a3a9 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
histedit: add more detailed help about "--outgoing"
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Tue, 01 Oct 2013 00:12:34 +0900
parents fab753424e78
children 5c0dc243fe5b bbeee568a84d
files hgext/histedit.py
diffstat 1 files changed, 9 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/histedit.py	Tue Oct 01 00:12:34 2013 +0900
+++ b/hgext/histedit.py	Tue Oct 01 00:12:34 2013 +0900
@@ -466,6 +466,15 @@
     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