Mercurial > hgsubversion
annotate tests/fixtures/copies.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 | 64d961130a07 |
children |
rev | line source |
---|---|
960
502613f6b583
editor: ignore added or copied files excluded by a filemap
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
1 #!/bin/sh |
502613f6b583
editor: ignore added or copied files excluded by a filemap
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
2 # |
502613f6b583
editor: ignore added or copied files excluded by a filemap
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
3 # Generate copies.svndump |
502613f6b583
editor: ignore added or copied files excluded by a filemap
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
4 # |
502613f6b583
editor: ignore added or copied files excluded by a filemap
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
5 |
502613f6b583
editor: ignore added or copied files excluded by a filemap
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
6 rm -rf temp |
502613f6b583
editor: ignore added or copied files excluded by a filemap
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
7 mkdir temp |
502613f6b583
editor: ignore added or copied files excluded by a filemap
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
8 cd temp |
502613f6b583
editor: ignore added or copied files excluded by a filemap
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
9 mkdir -p import/trunk/dir |
502613f6b583
editor: ignore added or copied files excluded by a filemap
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
10 echo a > import/trunk/dir/a |
502613f6b583
editor: ignore added or copied files excluded by a filemap
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
11 |
502613f6b583
editor: ignore added or copied files excluded by a filemap
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
12 svnadmin create testrepo |
502613f6b583
editor: ignore added or copied files excluded by a filemap
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
13 svnurl=file://`pwd`/testrepo |
502613f6b583
editor: ignore added or copied files excluded by a filemap
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
14 svn import import $svnurl -m init |
502613f6b583
editor: ignore added or copied files excluded by a filemap
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
15 |
502613f6b583
editor: ignore added or copied files excluded by a filemap
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
16 svn co $svnurl project |
502613f6b583
editor: ignore added or copied files excluded by a filemap
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
17 cd project |
502613f6b583
editor: ignore added or copied files excluded by a filemap
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
18 svn cp trunk/dir trunk/dir2 |
502613f6b583
editor: ignore added or copied files excluded by a filemap
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
19 echo b >> trunk/dir2/a |
502613f6b583
editor: ignore added or copied files excluded by a filemap
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
20 svn ci -m 'copy/edit trunk/dir/a' |
962
8648ccfb8325
editor: process missing files with regular files
Patrick Mezard <patrick@mezard.eu>
parents:
960
diff
changeset
|
21 svn up |
8648ccfb8325
editor: process missing files with regular files
Patrick Mezard <patrick@mezard.eu>
parents:
960
diff
changeset
|
22 svn cp trunk/dir2 trunk/dir3 |
8648ccfb8325
editor: process missing files with regular files
Patrick Mezard <patrick@mezard.eu>
parents:
960
diff
changeset
|
23 svn ci -m 'copy dir2 to dir3' |
963
64d961130a07
editor: do not record invalid path deletion
Patrick Mezard <patrick@mezard.eu>
parents:
962
diff
changeset
|
24 svn rm trunk/dir3/a |
64d961130a07
editor: do not record invalid path deletion
Patrick Mezard <patrick@mezard.eu>
parents:
962
diff
changeset
|
25 svn cp trunk/dir2/a trunk/dir3/a |
64d961130a07
editor: do not record invalid path deletion
Patrick Mezard <patrick@mezard.eu>
parents:
962
diff
changeset
|
26 svn ci -m 'copy and remove' |
960
502613f6b583
editor: ignore added or copied files excluded by a filemap
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
27 cd .. |
502613f6b583
editor: ignore added or copied files excluded by a filemap
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
28 |
502613f6b583
editor: ignore added or copied files excluded by a filemap
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
29 svnadmin dump testrepo > ../copies.svndump |