Mercurial > hgsubversion
view tests/fixtures/delentries.sh @ 313:942f198b8ff5
hg_delta_editor: detect new branches issued from non-branch directories
This fix solves the following case: let's /dumb/layout/project be an existing
project. To normalize the trunk/branches/tags layout, people may do:
$ mkdir /project
$ mv /dumb/layout/project /project/project
# Oups, should have been trunk!
$ mv /project/project /project/trunk
trunk creation was ignore because:
- update_branch_map() sees it come from a non-branch copy source and ignores it
(case #3).
- since it is not in self.branches, add_directory() ignores the non-existing path.
Then trunk is left uninitialized.
To solve this, we allow update_branch_map() to detect branches copied from
non-canonical locations.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sun, 03 May 2009 21:42:42 -0500 |
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