Mercurial > hgsubversion
view tests/fixtures/symlinks.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 | b37c401b7f92 |
children |
line wrap: on
line source
#!/bin/sh # # Generate symlinks.svndump # mkdir temp cd temp mkdir project-orig cd project-orig mkdir trunk mkdir branches cd .. svnadmin create testrepo svnurl=file://`pwd`/testrepo svn import project-orig $svnurl -m "init project" svn co $svnurl project cd project/trunk echo a > a ln -s a linka ln -s a linka2 mkdir d ln -s a d/linka svn add a linka linka2 d svn ci -m "add symlinks" # Move symlinks svn mv linka linkaa svn mv d d2 svn commit -m "moving symlinks" # Update symlinks (test "link " prefix vs applydelta) echo b > b rm linkaa ln -s b linkaa rm d2/linka ln -s b d2/linka svn ci -m "update symlinks" # Replace a symlink with a regular file rm linkaa echo data > linkaa svn propdel svn:special linkaa # Replace another symlink with a regular file in another way # It should mark linka2 as R(eplaced) svn rm linka2 echo data2 > linka2 svn add linka2 svn propdel svn:special linka2 svn rm d2/linka svn ci -m "undo link" cd ../.. svnadmin dump testrepo > ../symlinks.svndump