hgext/rebase.py
branchstable
changeset 24870 4ec40a4db64a
parent 24758 d7451adc72f6
child 24944 08ec11e3ae4c
child 25070 bd98d073a34f
--- a/hgext/rebase.py	Tue Apr 28 23:27:18 2015 +0900
+++ b/hgext/rebase.py	Tue Apr 28 10:19:46 2015 -0700
@@ -1040,6 +1040,10 @@
             # dropping it
             if 'rev' in opts:
                 del opts['rev']
+            # positional argument from pull conflicts with rebase's own
+            # --source.
+            if 'source' in opts:
+                del opts['source']
             rebase(ui, repo, **opts)
             branch = repo[None].branch()
             dest = repo[branch].rev()