Breezy

Merge lp:~jelmer/brz/fix-fastimport into lp:brz

  1. fix-fastimport
  2. Merge into trunk
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/fix-fastimport
Merge into: lp:brz
Diff against target: 14 lines (+4/-0)
1 file modified
breezy/plugins/fastimport/helpers.py (+4/-0)
To merge this branch: bzr merge lp:~jelmer/brz/fix-fastimport
Reviewer Review Type Date Requested Status
Martin Packman Approve
Review via email: mp+325341@code.launchpad.net

Commit message

Fix fastimport tests.

Description of the change

Fix fastimport tests.

This regressed after recent changes, but didn't get caught because babune doesn't have fastimport.

To post a comment you must log in.
Revision history for this message
Martin Packman (gz) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/plugins/fastimport/helpers.py'
2--- breezy/plugins/fastimport/helpers.py 2017-06-07 00:24:29 +0000
3+++ breezy/plugins/fastimport/helpers.py 2017-06-08 21:11:43 +0000
4@@ -19,6 +19,10 @@
5
6 import stat
7
8+from ... import (
9+ controldir,
10+ )
11+
12
13 def escape_commit_message(message):
14 """Replace xml-incompatible control characters."""

Subscribers

People subscribed via source and target branches