Mercurial > hgsubversion
view tests/fixtures/delentries.sh @ 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 | 19aabf67c792 |
children |
line wrap: on
line source
#!/bin/sh # # Generate delentries.svndump # mkdir temp cd temp mkdir project-orig cd project-orig mkdir trunk cd .. svnadmin create testrepo svnurl=file://`pwd`/testrepo svn import project-orig $svnurl -m "init project" svn co $svnurl project cd project/trunk # Regular file deletion echo a > a # Another file starting like the deleted file echo aa > aa mkdir d1 mkdir d1/d2 mkdir d1/d2/d3 echo c > d1/c # Test directory deletion echo d > d1/d2/c # Test subdirectory deletion echo e > d1/d2/d3/e echo f > d1/d2/d3/f # This file starts as the deleted directory, can be confusing echo d2prefix > d1/d2prefix svn add a aa d1 svn ci -m "add entries" svn rm a d1/d2 svn ci -m "remove entries" cd ../.. svnadmin dump testrepo > ../delentries.svndump