Merge lp:~wasabi34/svn2bzr/bug496791 into lp:svn2bzr

Proposed by Robbert Klarenbeek
Status: Needs review
Proposed branch: lp:~wasabi34/svn2bzr/bug496791
Merge into: lp:svn2bzr
Diff against target: 11 lines (+1/-1)
1 file modified
branchcreator.py (+1/-1)
To merge this branch: bzr merge lp:~wasabi34/svn2bzr/bug496791
Reviewer Review Type Date Requested Status
svn2bzr Pending
Review via email: mp+16177@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Robbert Klarenbeek (wasabi34) wrote :

This fix was made for bug #496791, which turned out to be a bug on FreeBSD, but not on Linux. The bugfix was tested on both Linux and FreeBSD with test.dump attached to bug #496791. On FreeBSD the issue was resolved, on Linux the output branch stayed the same, so running in Linux doesn't seem to be affected.

Unmerged revisions

26. By Robbert Klarenbeek <email address hidden>

UTF-8 decode original log message before commit

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'branchcreator.py'
2--- branchcreator.py 2009-06-08 03:55:09 +0000
3+++ branchcreator.py 2009-12-15 01:36:15 +0000
4@@ -601,7 +601,7 @@
5 else:
6 offset = 0 # leave it as UTC
7
8- self.commit(revno, revision.prop.get("svn:log", ""),
9+ self.commit(revno, revision.prop.get("svn:log", "").decode("utf8"),
10 committer=revision.prop.get("svn:author"),
11 timestamp=timestamp, timezone=offset)
12

Subscribers

People subscribed via source and target branches