hgext/rebase.py
changeset 38065 64280cd4b454
parent 38064 46e8abc4eb04
child 38239 ead71b15efd5
--- a/hgext/rebase.py	Sat May 19 21:46:54 2018 +0530
+++ b/hgext/rebase.py	Sat May 19 21:47:59 2018 +0530
@@ -809,7 +809,7 @@
         for key in opts:
             if key != r'auto_orphans' and opts.get(key):
                 raise error.Abort(_('--auto-orphans is incompatible with %s') %
-                                  ('--' + key))
+                                  ('--' + pycompat.bytestr(key)))
         userrevs = list(repo.revs(opts.get(r'auto_orphans')))
         opts[r'rev'] = [revsetlang.formatspec('%ld and orphan()', userrevs)]
         opts[r'dest'] = '_destautoorphanrebase(SRC)'