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

Proposed by Dustin Kirkland  on 2018-04-09
Status: Needs review
Proposed branch: lp:~kirkland/bzr-fastimport/1607974
Merge into: lp:bzr-fastimport
Diff against target: 21 lines (+2/-2)
1 file modified
exporter.py (+2/-2)
To merge this branch: bzr merge lp:~kirkland/bzr-fastimport/1607974
Reviewer Review Type Date Requested Status
Bazaar Developers 2018-04-09 Pending
Review via email: mp+342846@code.launchpad.net

Commit message

Fixes fast import/export on Ubuntu 17.10 and newer Python

To post a comment you must log in.

Unmerged revisions

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

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'exporter.py'
2--- exporter.py 2014-05-15 09:26:03 +0000
3+++ exporter.py 2018-04-09 01:03:08 +0000
4@@ -319,7 +319,7 @@
5 mark = 1
6 self.revid_to_mark[revid] = mark
7 file_cmds = self._get_filecommands(bzrlib.revision.NULL_REVISION, revid)
8- self.print_cmd(self._get_commit_command(ref, mark, revobj, file_cmds))
9+ self.print_cmd(self._get_commit_command(ref, str(mark), revobj, file_cmds))
10
11 def emit_commit(self, revid, ref):
12 if revid in self.revid_to_mark or revid in self.excluded_revisions:
13@@ -355,7 +355,7 @@
14 mark = ncommits + 1
15 self.revid_to_mark[revid] = mark
16 file_cmds = self._get_filecommands(parent, revid)
17- self.print_cmd(self._get_commit_command(ref, mark, revobj, file_cmds))
18+ self.print_cmd(self._get_commit_command(ref, str(mark), revobj, file_cmds))
19
20 # Report progress and checkpoint if it's time for that
21 self.report_progress(ncommits)

Subscribers

People subscribed via source and target branches