author | Jonathan Nieder <jrnieder@gmail.com> | |
Thu, 26 May 2011 07:27:48 +0000 (02:27 -0500) | ||
committer | Jonathan Nieder <jrnieder@gmail.com> | |
Thu, 26 May 2011 07:27:48 +0000 (02:27 -0500) | ||
commit | e9f3f8b6f4141dae526e9792ba6dede7aa038622 | |
tree | e4d1b8abaaef180f844b1d0f57afbc87e4c4f677 | tree | snapshot |
parent | c19d653c4fcdc93169507c09f8f66ebffbdbb9a5 | commit | diff |
parent | c846e4107876936bed7177a811559bd74a72dcd8 | commit | diff |
Merge branch 'db/delta-applier' into db/text-delta
* db/delta-applier:
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: 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 |