Mercurial > hgsubversion
view tests/fixtures/symlinks.sh @ 1028:c4b25a903ad3
layouts: consistently return None for default branch
This makes the single and standard layouts consistent in what they
return for the default branch. Previously, single had returned
'default' now they both return None.
In addition, this fixes a now-exposed bug in stupid's convert_revision
logic. Specifically, when a file is replaced by another file within
the same branch, we treated that as replacing the entire branch. this
bug was previously hidden because meta.split_branch_path and
meta.localname were inconsistent in what they returned for the single
layout. meta.split-branch_path is used to maintain the set of known
branches, where meta.localname is used to determine the branch for the
path being replaced. This resulted in erroneously hitting the
condition that skipped paths outside branches we know about when
considering replace operations from svn.
author | David Schleimer <dschleimer@fb.com> |
---|---|
date | Wed, 05 Jun 2013 11:00:06 -0700 |
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