Mercurial > public > mercurial-scm > hg-stable

diff mercurial/commands.py @ 27423:c953e26f3734

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bundle: warn for --base with --all
author timeless <timeless@mozdev.org>
date Thu, 17 Dec 2015 15:05:25 +0000
parents 67eeb7421d8d
children c2854c41f9ac
line wrap: on
line diff
--- a/mercurial/commands.py	Thu Dec 17 15:03:45 2015 +0000
+++ b/mercurial/commands.py	Thu Dec 17 15:05:25 2015 +0000
@@ -1347,6 +1347,8 @@
         if dest:
             raise error.Abort(_("--all is incompatible with specifying "
                                 "a destination"))
+        if opts.get('base'):
+            ui.warn(_("ignoring --base because --all was specified\n"))
         base = ['null']
     else:
         base = scmutil.revrange(repo, opts.get('base'))