Mercurial > hg
diff mercurial/commands.py @ 27899:78b9fdb844c1
graft: warn when -r is combined with revisions as positional arguments
The behaviour in this case is undefined. Instead of silently doing something
"random" and surprising, at least issue a warning.
(This should perhaps be considered a "deprecation" and turned into an error in
a future release.)
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Sun, 17 Jan 2016 19:33:02 +0100 |
parents | 2cc44efcb7cf |
children | 645e78845383 |
line wrap: on
line diff
--- a/mercurial/commands.py Sun Jan 17 19:33:02 2016 +0100 +++ b/mercurial/commands.py Sun Jan 17 19:33:02 2016 +0100 @@ -3889,6 +3889,10 @@ return _dograft(ui, repo, *revs, **opts) def _dograft(ui, repo, *revs, **opts): + if revs and opts['rev']: + ui.warn(_('warning: inconsistent use of --rev might give unexpected ' + 'revision ordering!\n')) + revs = list(revs) revs.extend(opts['rev'])