view tests/fixtures/delete_restore_trunk.svndump @ 937:fb6f6b7fa5a5

editor: implement file batons The concept of current.file is incorrect, svn_delta.h documents open file lifetime as: * 5. When the producer calls @c open_file or @c add_file, either: * * (a) The producer must follow with any changes to the file * (@c change_file_prop and/or @c apply_textdelta, as applicable), * followed by a @c close_file call, before issuing any other file * or directory calls, or * * (b) The producer must follow with a @c change_file_prop call if * it is applicable, before issuing any other file or directory * calls; later, after all directory batons including the root * have been closed, the producer must issue @c apply_textdelta * and @c close_file calls. So, an open file can be kept open until after the root directory is closed and have deltas applied afterwards. In the meantime, other files may have been opened and patched, overwriting the current.file variable. This patch fixes it by introducing file batons bound to file paths, and using them to deduce the correct target in apply_textdelta(). In theory, open files could be put in a staging area until they are closed and moved in the RevisionData. But the current code registers files copied during a directory copy as open files and these will not receive a close_file() event. This separation will be enforced later.
author Patrick Mezard <patrick@mezard.eu>
date Sun, 23 Sep 2012 19:52:48 +0200
parents c4ee11a5d04c
children
line wrap: on
line source

SVN-fs-dump-format-version: 2

UUID: fca176f4-a346-479b-ae2c-78c8442c3809

Revision-number: 0
Prop-content-length: 56
Content-length: 56

K 8
svn:date
V 27
2012-05-16T22:55:55.613464Z
PROPS-END

Revision-number: 1
Prop-content-length: 103
Content-length: 103

K 7
svn:log
V 3
btt
K 10
svn:author
V 6
bryano
K 8
svn:date
V 27
2012-05-16T22:55:56.081065Z
PROPS-END

Node-path: branches
Node-kind: dir
Node-action: add
Prop-content-length: 10
Content-length: 10

PROPS-END


Node-path: tags
Node-kind: dir
Node-action: add
Prop-content-length: 10
Content-length: 10

PROPS-END


Node-path: trunk
Node-kind: dir
Node-action: add
Prop-content-length: 10
Content-length: 10

PROPS-END


Revision-number: 2
Prop-content-length: 108
Content-length: 108

K 7
svn:log
V 8
add file
K 10
svn:author
V 6
bryano
K 8
svn:date
V 27
2012-05-16T22:55:57.071178Z
PROPS-END

Node-path: trunk/foo
Node-kind: file
Node-action: add
Prop-content-length: 10
Text-content-length: 4
Text-content-md5: d3b07384d113edec49eaa6238ad5ff00
Text-content-sha1: f1d2d2f924e986ac86fdf7b36c94bcdf32beec15
Content-length: 14

PROPS-END
foo


Revision-number: 3
Prop-content-length: 113
Content-length: 113

K 7
svn:log
V 12
delete trunk
K 10
svn:author
V 6
bryano
K 8
svn:date
V 27
2012-05-16T22:55:59.058026Z
PROPS-END

Node-path: trunk
Node-action: delete


Revision-number: 4
Prop-content-length: 114
Content-length: 114

K 7
svn:log
V 13
restore trunk
K 10
svn:author
V 6
bryano
K 8
svn:date
V 27
2012-05-16T22:56:01.055887Z
PROPS-END

Node-path: trunk
Node-kind: dir
Node-action: add
Node-copyfrom-rev: 2
Node-copyfrom-path: trunk


Revision-number: 5
Prop-content-length: 115
Content-length: 115

K 7
svn:log
V 14
append to file
K 10
svn:author
V 6
bryano
K 8
svn:date
V 27
2012-05-16T22:56:02.060991Z
PROPS-END

Node-path: trunk/foo
Node-kind: file
Node-action: change
Text-content-length: 8
Text-content-md5: f47c75614087a8dd938ba4acff252494
Text-content-sha1: 4e48e2c9a3d2ca8a708cb0cc545700544efb5021
Content-length: 8

foo
bar