diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-01-27 11:04:28 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-27 11:20:00 -0800 |
| commit | d47553665833935157292a71248278a40e32c320 (patch) | |
| tree | 13a04cd180ad12b34dbf8cefba185f0c3ec65db9 /.gitignore | |
| parent | 69204d0ab18d28d07ee2c8c9b50bbf5bd80343ab (diff) | |
| parent | c5bcbcdcfa1e2a1977497cb3a342c0365c8d78d6 (diff) | |
| download | git-d47553665833935157292a71248278a40e32c320.tar.gz | |
Merge branch 'svn-fe' of git://repo.or.cz/git/jrn into jn/svn-fe
This simplifies svn-fe a great deal and fulfills a longstanding wish:
support for dumps with deltas in them, and incremental imports.
The cost is that commandline usage of the svn-fe tool becomes a little
more complicated since it no longer keeps state itself but instead reads
blobs back from fast-import in order to copy them between revisions and
apply deltas to them.
Also removes a couple of custom data structures and replaces them with
strbufs like other parts of Git.
* 'svn-fe' of git://repo.or.cz/git/jrn: (32 commits)
vcs-svn: reset first_commit_done in fast_export_init
vcs-svn: do not initialize report_buffer twice
vcs-svn: avoid hangs from corrupt deltas
vcs-svn: guard against overflow when computing preimage length
vcs-svn: cap number of bytes read from sliding view
test-svn-fe: split off "test-svn-fe -d" into a separate function
vcs-svn: implement text-delta handling
vcs-svn: let deltas use data from preimage
vcs-svn: let deltas use data from postimage
vcs-svn: verify that deltas consume all inline data
vcs-svn: implement copyfrom_data delta instruction
vcs-svn: read instructions from deltas
vcs-svn: read inline data from deltas
vcs-svn: read the preimage when applying deltas
vcs-svn: parse svndiff0 window header
vcs-svn: skeleton of an svn delta parser
vcs-svn: make buffer_read_binary API more convenient
vcs-svn: learn to maintain a sliding view of a file
Makefile: list one vcs-svn/xdiff object or header per line
vcs-svn: avoid using ls command twice
...
Conflicts:
Makefile
contrib/svn-fe/svn-fe.txt
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index 3b7680ea1e..87fcc5f6ff 100644 --- a/.gitignore +++ b/.gitignore @@ -181,16 +181,13 @@ /test-line-buffer /test-match-trees /test-mktemp -/test-obj-pool /test-parse-options /test-path-utils /test-run-command /test-sha1 /test-sigchain -/test-string-pool /test-subprocess /test-svn-fe -/test-treap /common-cmds.h *.tar.gz *.dsc |