svn2bzr

Merge lp:~jvorwerk/svn2bzr/bug393758 into lp:svn2bzr

  1. bug393758
  2. Merge into trunk
Proposed by Jan Vorwerk
Status: Needs review
Proposed branch: lp:~jvorwerk/svn2bzr/bug393758
Merge into: lp:svn2bzr
Diff against target: 11 lines (+1/-0)
1 file modified
branchcreator.py (+1/-0)
To merge this branch: bzr merge lp:~jvorwerk/svn2bzr/bug393758
Reviewer Review Type Date Requested Status
Robert Collins (community) Approve
svn2bzr Pending
Review via email: mp+15005@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jan Vorwerk (jvorwerk) wrote :

Hi Gustavo,

This is my first commit to Launchpad (not a very complex one! ;-) ) so I am not 100% of the process here. Among others, I could not find the way to run a test suite although there are numerous dump files...

This bug was annoying me as well, so I fixed it the best I could.

Please let me know if you see an issue.

Best regards
Jan

Reply
Revision history for this message
Robert Collins (lifeless) wrote :

Looks trivially ok to me, FWIW.

review: Approve
Reply

Unmerged revisions

26. By Jan Vorwerk

Fixed bug #393758: fails to process repository due to commit message value - replace all Windows EOL (\r\n) with \n and then replace remaining \r (old MacOS) with \n as well.

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-11-18 20:10:26 +0000
4@@ -521,6 +521,7 @@
5 self._log.debug('len(content) = %d' % len(content))
6 data = str(self._uuid) + str(revno) + str(rel_branch_path) + str(content)
7 revid = self._generate_rev_id(committer, timestamp, data)
8+ message = message.replace('\r\n', '\n').replace('\r', '\n')
9 brt.tree.commit(message, committer=committer, rev_id=revid,
10 timestamp=timestamp, timezone=timezone,
11 verbose=False)

Subscribers

People subscribed via source and target branches