summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-12-12 00:30:38 +0100
committerJelmer Vernooij <jelmer@samba.org>2010-12-12 00:30:38 +0100
commit348a753d87ca73eb92b7128f2776f9bff697606a (patch)
tree5fa9aec9c182bbecf2912b7eef2b648eb8e3cf6e
parentb0e368d5ee403e2c35a85e6456a13a4e71b7d568 (diff)
downloadbzr-fastimport-348a753d87ca73eb92b7128f2776f9bff697606a.tar.gz
Strip leading slashes when exporting Subversion repositories.
-rw-r--r--NEWS3
-rwxr-xr-xexporters/svn-fast-export.py4
2 files changed, 5 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 68d380d..8bdbd84 100644
--- a/NEWS
+++ b/NEWS
@@ -33,6 +33,9 @@ Bug fixes
* Allow entries without email address in user map. (Jelmer Vernooij, #576598)
+* Strip leading slashes when exporting Subversion repositories.
+ (Jelmer Vernooij, #477869)
+
0.9 28-Feb-2010
===============
diff --git a/exporters/svn-fast-export.py b/exporters/svn-fast-export.py
index fd88094..520ee16 100755
--- a/exporters/svn-fast-export.py
+++ b/exporters/svn-fast-export.py
@@ -111,10 +111,10 @@ def export_revision(rev, repo, fs, pool):
pass
else:
if c_t == 'D':
- file_changes.append("D %s" % MATCHER.replace(path))
+ file_changes.append("D %s" % MATCHER.replace(path).lstrip("/"))
else:
marks[i] = MATCHER.replace(path)
- file_changes.append("M 644 :%s %s" % (i, marks[i]))
+ file_changes.append("M 644 :%s %s" % (i, marks[i].lstrip("/")))
sys.stdout.write("blob\nmark :%s\n" % i)
dump_file_blob(root, path, revpool)
i += 1