hgext/rebase.py
changeset 17989 e8c9b13c7799
parent 17973 fa6be7b81f77
parent 17988 848345a8d6ad
child 18093 9c76da468a19
--- a/hgext/rebase.py	Thu Nov 29 08:44:54 2012 -0500
+++ b/hgext/rebase.py	Thu Nov 29 11:44:22 2012 -0600
@@ -710,6 +710,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()