# HG changeset patch
# User Augie Fackler <raf@durin42.com>
# Date 1392214743 18000
# Node ID cb4dccc90ff1ef75017be49daf8bc85dcb7214ef
# Parent  99c503cfcc9c6f1399b47d4a67bcdce6a1785ead# Parent  bab98093051b32095ae20663adf507dc859af77b
Merge with stable.

diff --git a/hgsubversion/svnrepo.py b/hgsubversion/svnrepo.py
--- a/hgsubversion/svnrepo.py
+++ b/hgsubversion/svnrepo.py
@@ -282,7 +282,15 @@ class SubversionPrompt(object):
         else:
             msg += '(R)eject or accept (t)emporarily? '
             choices = (('&Reject'), ('&Temporarily'))
-        choice = self.ui.promptchoice(msg, choices, default=0)
+        try:
+            choice = self.ui.promptchoice(msg, choices, default=0)
+        except TypeError:
+            # mercurial version >2.6 use a different syntax and method signature
+            msg += '$$ &Reject $$ &Temporarily '
+            if may_save:
+                msg += '$$ &Permanently '
+            choice = self.ui.promptchoice(msg, default=0)
+
         if choice == 1:
             creds = (failures, False)
         elif may_save and choice == 2: