summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorLibravatar Jonathan Nieder <jrnieder@gmail.com>2011-06-15 06:17:14 -0500
committerLibravatar Jonathan Nieder <jrnieder@gmail.com>2011-06-15 06:17:14 -0500
commite09ab7d936870d57d2219bd70d96faa51805c042 (patch)
treea8a247ae4053480219c6c2dad47c9466a888c0f0 /contrib
parentMerge branch 'db/delta-applier' into svn-fe (diff)
parentvcs-svn: avoid hangs from corrupt deltas (diff)
downloadtgif-e09ab7d936870d57d2219bd70d96faa51805c042.tar.xz
Merge branch 'db/text-delta' into svn-fe
* db/text-delta: vcs-svn: avoid hangs from corrupt deltas vcs-svn: guard against overflow when computing preimage length vcs-svn: implement text-delta handling
Diffstat (limited to 'contrib')
-rw-r--r--contrib/svn-fe/svn-fe.txt5
1 files changed, 1 insertions, 4 deletions
diff --git a/contrib/svn-fe/svn-fe.txt b/contrib/svn-fe/svn-fe.txt
index 85f7b83028..2dd27ceb0e 100644
--- a/contrib/svn-fe/svn-fe.txt
+++ b/contrib/svn-fe/svn-fe.txt
@@ -9,7 +9,7 @@ SYNOPSIS
--------
[verse]
mkfifo backchannel &&
-svnadmin dump --incremental REPO |
+svnadmin dump --deltas REPO |
svn-fe [url] 3<backchannel |
git fast-import --cat-blob-fd=3 3>backchannel
@@ -32,9 +32,6 @@ Subversion's repository dump format is documented in full in
Files in this format can be generated using the 'svnadmin dump' or
'svk admin dump' command.
-Dumps produced with 'svnadmin dump --deltas' (dumpfile format v3)
-are not supported.
-
OUTPUT FORMAT
-------------
The fast-import format is documented by the git-fast-import(1)