Mercurial > hgsubversion
view tests/fixtures/unrelatedbranch.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 | ea65fe2b0856 |
children |
line wrap: on
line source
#!/bin/sh # # Generate unrelatedbranch.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 svn add a svn ci -m "add a in trunk" cd ../branches # Create an unrelated branch with another file. It used to lead the converter # to think branch1 was a copy of trunk, even without copy information. mkdir branch1 echo b > branch1/b svn add branch1 svn ci -m "add b in branch1" # Make a real branch too for comparison svn cp ../trunk branch2 echo b > branch2/b svn add branch2/b svn ci -m "add b to branch2" # Add a file in the branch root for fun echo c > c svn add c svn ci -m "add c in branches/" # Even update it echo c >> c svn ci -m "change c" cd ../.. svnadmin dump testrepo > ../unrelatedbranch.svndump