branch | stable |
changeset 17988 | 848345a8d6ad |
parent 17615 | 9e2dc0d292cd |
child 17989 | e8c9b13c7799 |
--- a/hgext/rebase.py Wed Nov 28 17:53:52 2012 -0600 +++ b/hgext/rebase.py Thu Nov 29 16:37:15 2012 +0100 @@ -706,6 +706,10 @@ commands.postincoming = origpostincoming revspostpull = len(repo) if revspostpull > revsprepull: + # --rev option from pull conflict with rebase own --rev + # dropping it + if 'rev' in opts: + del opts['rev'] rebase(ui, repo, **opts) branch = repo[None].branch() dest = repo[branch].rev()