author | Jonathan Nieder <jrnieder@gmail.com> | |
Wed, 15 Jun 2011 07:17:51 +0000 (02:17 -0500) | ||
committer | Jonathan Nieder <jrnieder@gmail.com> | |
Wed, 15 Jun 2011 07:17:51 +0000 (02:17 -0500) | ||
commit | a8d3d265450d8fc2c14a4bcd2f16d28d4ea0196b | |
tree | 5e83d8ad5fceb4e934838da21478adf90d5c5653 | tree | snapshot |
parent | c19d653c4fcdc93169507c09f8f66ebffbdbb9a5 | commit | diff |
parent | fbdd4f6fb477885e4bf81658e02c3542a861c695 | commit | diff |
Merge branch 'db/delta-applier' into svn-fe
* db/delta-applier:
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: 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
Conflicts:
Makefile
vcs-svn/LICENSE
* db/delta-applier:
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: 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
Conflicts:
Makefile
vcs-svn/LICENSE
Makefile | diff1 | | diff2 | | blob | history |
vcs-svn/LICENSE | diff1 | | diff2 | | blob | history |