diff options
author | David Barr <david.barr@cordelta.com> | 2010-11-19 18:57:46 -0600 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-11-24 14:53:59 -0800 |
commit | 6b01b67658e2905b550739f1aee56a00911ca13c (patch) | |
tree | 15212576be03435d3ccd798720bd8dd156e3f595 /Documentation/git-apply.txt | |
parent | vcs-svn: Sharpen parsing of property lines (diff) | |
download | tgif-6b01b67658e2905b550739f1aee56a00911ca13c.tar.xz |
vcs-svn: Implement Prop-delta handling
The rules for what file is used as delta source for each file are not
documented in dump-load-format.txt. Luckily, the Apache Software
Foundation repository has rich enough examples to figure out most of
the rules:
Node-action: replace implies the empty property set and empty text as
preimage for deltas. Otherwise, if a copyfrom source is given, that
node is the preimage for deltas. Lastly, if none of the above applies
and the node path exists in the current revision, then that version
forms the basis.
[jn: refactored, with tests]
Signed-off-by: David Barr <david.barr@cordelta.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-apply.txt')
0 files changed, 0 insertions, 0 deletions