Merge lp:~kirkland/bzr-fastimport/1607974 into lp:bzr-fastimport

[Dustin Kirkland ]

Fixes fast import/export on Ubuntu 17.10 and newer Python

Unmerged revisions

361. By Dustin Kirkland  on 2018-04-09

fix LP: #1607974:
  - bzr fast-export TypeError: cannot concatenate 'str' and 'int' objects"

=== modified file 'exporter.py'
--- exporter.py	2014-05-15 09:26:03 +0000
+++ exporter.py	2018-04-09 01:03:08 +0000
@@ -319,7 +319,7 @@
         mark = 1
         self.revid_to_mark[revid] = mark
         file_cmds = self._get_filecommands(bzrlib.revision.NULL_REVISION, revid)
-        self.print_cmd(self._get_commit_command(ref, mark, revobj, file_cmds))
+        self.print_cmd(self._get_commit_command(ref, str(mark), revobj, file_cmds))
 
     def emit_commit(self, revid, ref):
         if revid in self.revid_to_mark or revid in self.excluded_revisions:
@@ -355,7 +355,7 @@
         mark = ncommits + 1
         self.revid_to_mark[revid] = mark
         file_cmds = self._get_filecommands(parent, revid)
-        self.print_cmd(self._get_commit_command(ref, mark, revobj, file_cmds))
+        self.print_cmd(self._get_commit_command(ref, str(mark), revobj, file_cmds))
 
         # Report progress and checkpoint if it's time for that
         self.report_progress(ncommits)