Mercurial > hgsubversion
annotate tests/fixtures/addspecial.sh @ 950:a80b01ceb1fc
editor: relax copyfrom dir checks to avoid extra missing entries
When renaming a branch you get something like:
D /branch/bar
A /branch/foo (from /branch/foo:42)
Unfortunately, the branch layout for the revision being converted is
computed before starting to convert it. It means the copyfrom path
supplied in the add_directory() for /branch/foo will be be considered
invalid, be added to missing and fetched the slow way despite being in
the repository history. Avoid that by checking the path looks like a
branch path and matching it with the filemap. It will be resolved
afterwards anyway.
| author | Patrick Mezard <patrick@mezard.eu> |
|---|---|
| date | Sat, 06 Oct 2012 10:10:35 +0200 |
| parents | b6b1365e3489 |
| children |
| rev | line source |
|---|---|
|
901
bd12a4da0f35
replay: workaround svn not telling us about x/l flags (issue346)
Bryan O'Sullivan <bryano@fb.com>
parents:
diff
changeset
|
1 #!/bin/sh |
|
bd12a4da0f35
replay: workaround svn not telling us about x/l flags (issue346)
Bryan O'Sullivan <bryano@fb.com>
parents:
diff
changeset
|
2 |
|
bd12a4da0f35
replay: workaround svn not telling us about x/l flags (issue346)
Bryan O'Sullivan <bryano@fb.com>
parents:
diff
changeset
|
3 mkdir temp |
|
bd12a4da0f35
replay: workaround svn not telling us about x/l flags (issue346)
Bryan O'Sullivan <bryano@fb.com>
parents:
diff
changeset
|
4 cd temp |
|
bd12a4da0f35
replay: workaround svn not telling us about x/l flags (issue346)
Bryan O'Sullivan <bryano@fb.com>
parents:
diff
changeset
|
5 |
|
bd12a4da0f35
replay: workaround svn not telling us about x/l flags (issue346)
Bryan O'Sullivan <bryano@fb.com>
parents:
diff
changeset
|
6 svnadmin create repo |
|
bd12a4da0f35
replay: workaround svn not telling us about x/l flags (issue346)
Bryan O'Sullivan <bryano@fb.com>
parents:
diff
changeset
|
7 svn co file://`pwd`/repo wc |
|
bd12a4da0f35
replay: workaround svn not telling us about x/l flags (issue346)
Bryan O'Sullivan <bryano@fb.com>
parents:
diff
changeset
|
8 cd wc |
|
bd12a4da0f35
replay: workaround svn not telling us about x/l flags (issue346)
Bryan O'Sullivan <bryano@fb.com>
parents:
diff
changeset
|
9 |
|
bd12a4da0f35
replay: workaround svn not telling us about x/l flags (issue346)
Bryan O'Sullivan <bryano@fb.com>
parents:
diff
changeset
|
10 mkdir -p trunk branches |
|
bd12a4da0f35
replay: workaround svn not telling us about x/l flags (issue346)
Bryan O'Sullivan <bryano@fb.com>
parents:
diff
changeset
|
11 svn add trunk branches |
|
bd12a4da0f35
replay: workaround svn not telling us about x/l flags (issue346)
Bryan O'Sullivan <bryano@fb.com>
parents:
diff
changeset
|
12 svn ci -m'initial structure' |
|
bd12a4da0f35
replay: workaround svn not telling us about x/l flags (issue346)
Bryan O'Sullivan <bryano@fb.com>
parents:
diff
changeset
|
13 cd trunk |
|
bd12a4da0f35
replay: workaround svn not telling us about x/l flags (issue346)
Bryan O'Sullivan <bryano@fb.com>
parents:
diff
changeset
|
14 echo a>a |
|
bd12a4da0f35
replay: workaround svn not telling us about x/l flags (issue346)
Bryan O'Sullivan <bryano@fb.com>
parents:
diff
changeset
|
15 svn add a |
|
bd12a4da0f35
replay: workaround svn not telling us about x/l flags (issue346)
Bryan O'Sullivan <bryano@fb.com>
parents:
diff
changeset
|
16 svn ci -mci1 a |
|
bd12a4da0f35
replay: workaround svn not telling us about x/l flags (issue346)
Bryan O'Sullivan <bryano@fb.com>
parents:
diff
changeset
|
17 cd .. |
|
bd12a4da0f35
replay: workaround svn not telling us about x/l flags (issue346)
Bryan O'Sullivan <bryano@fb.com>
parents:
diff
changeset
|
18 svn up |
|
bd12a4da0f35
replay: workaround svn not telling us about x/l flags (issue346)
Bryan O'Sullivan <bryano@fb.com>
parents:
diff
changeset
|
19 svn cp trunk branches/foo |
|
bd12a4da0f35
replay: workaround svn not telling us about x/l flags (issue346)
Bryan O'Sullivan <bryano@fb.com>
parents:
diff
changeset
|
20 svn ci -m'branch foo' |
|
bd12a4da0f35
replay: workaround svn not telling us about x/l flags (issue346)
Bryan O'Sullivan <bryano@fb.com>
parents:
diff
changeset
|
21 cd branches/foo |
|
bd12a4da0f35
replay: workaround svn not telling us about x/l flags (issue346)
Bryan O'Sullivan <bryano@fb.com>
parents:
diff
changeset
|
22 ln -s a fnord |
|
bd12a4da0f35
replay: workaround svn not telling us about x/l flags (issue346)
Bryan O'Sullivan <bryano@fb.com>
parents:
diff
changeset
|
23 svn add fnord |
|
bd12a4da0f35
replay: workaround svn not telling us about x/l flags (issue346)
Bryan O'Sullivan <bryano@fb.com>
parents:
diff
changeset
|
24 svn ci -msymlink fnord |
|
904
b6b1365e3489
canonicalize svn paths even more awesomely
Bryan O'Sullivan <bryano@fb.com>
parents:
901
diff
changeset
|
25 mkdir 'spacy name' |
|
b6b1365e3489
canonicalize svn paths even more awesomely
Bryan O'Sullivan <bryano@fb.com>
parents:
901
diff
changeset
|
26 echo a > 'spacy name/spacy file' |
|
b6b1365e3489
canonicalize svn paths even more awesomely
Bryan O'Sullivan <bryano@fb.com>
parents:
901
diff
changeset
|
27 svn add 'spacy name' |
|
b6b1365e3489
canonicalize svn paths even more awesomely
Bryan O'Sullivan <bryano@fb.com>
parents:
901
diff
changeset
|
28 svn ci -mspacy 'spacy name' |
|
b6b1365e3489
canonicalize svn paths even more awesomely
Bryan O'Sullivan <bryano@fb.com>
parents:
901
diff
changeset
|
29 svn up |
|
b6b1365e3489
canonicalize svn paths even more awesomely
Bryan O'Sullivan <bryano@fb.com>
parents:
901
diff
changeset
|
30 echo b > 'spacy name/surprise ~' |
|
b6b1365e3489
canonicalize svn paths even more awesomely
Bryan O'Sullivan <bryano@fb.com>
parents:
901
diff
changeset
|
31 svn add 'spacy name/surprise ~' |
|
b6b1365e3489
canonicalize svn paths even more awesomely
Bryan O'Sullivan <bryano@fb.com>
parents:
901
diff
changeset
|
32 svn ci -mtilde 'spacy name' |
|
901
bd12a4da0f35
replay: workaround svn not telling us about x/l flags (issue346)
Bryan O'Sullivan <bryano@fb.com>
parents:
diff
changeset
|
33 svn up ../.. |
|
bd12a4da0f35
replay: workaround svn not telling us about x/l flags (issue346)
Bryan O'Sullivan <bryano@fb.com>
parents:
diff
changeset
|
34 echo foo > exe |
|
bd12a4da0f35
replay: workaround svn not telling us about x/l flags (issue346)
Bryan O'Sullivan <bryano@fb.com>
parents:
diff
changeset
|
35 chmod +x exe |
|
bd12a4da0f35
replay: workaround svn not telling us about x/l flags (issue346)
Bryan O'Sullivan <bryano@fb.com>
parents:
diff
changeset
|
36 svn add exe |
|
bd12a4da0f35
replay: workaround svn not telling us about x/l flags (issue346)
Bryan O'Sullivan <bryano@fb.com>
parents:
diff
changeset
|
37 svn ci -mexecutable exe |
|
bd12a4da0f35
replay: workaround svn not telling us about x/l flags (issue346)
Bryan O'Sullivan <bryano@fb.com>
parents:
diff
changeset
|
38 svn up ../.. |
|
bd12a4da0f35
replay: workaround svn not telling us about x/l flags (issue346)
Bryan O'Sullivan <bryano@fb.com>
parents:
diff
changeset
|
39 cd ../../trunk |
|
bd12a4da0f35
replay: workaround svn not telling us about x/l flags (issue346)
Bryan O'Sullivan <bryano@fb.com>
parents:
diff
changeset
|
40 svn merge ../branches/foo |
|
bd12a4da0f35
replay: workaround svn not telling us about x/l flags (issue346)
Bryan O'Sullivan <bryano@fb.com>
parents:
diff
changeset
|
41 svn ci -mmerge |
|
bd12a4da0f35
replay: workaround svn not telling us about x/l flags (issue346)
Bryan O'Sullivan <bryano@fb.com>
parents:
diff
changeset
|
42 svn up |
|
bd12a4da0f35
replay: workaround svn not telling us about x/l flags (issue346)
Bryan O'Sullivan <bryano@fb.com>
parents:
diff
changeset
|
43 |
|
bd12a4da0f35
replay: workaround svn not telling us about x/l flags (issue346)
Bryan O'Sullivan <bryano@fb.com>
parents:
diff
changeset
|
44 pwd |
|
bd12a4da0f35
replay: workaround svn not telling us about x/l flags (issue346)
Bryan O'Sullivan <bryano@fb.com>
parents:
diff
changeset
|
45 cd ../../.. |
|
bd12a4da0f35
replay: workaround svn not telling us about x/l flags (issue346)
Bryan O'Sullivan <bryano@fb.com>
parents:
diff
changeset
|
46 svnadmin dump temp/repo > addspecial.svndump |
|
bd12a4da0f35
replay: workaround svn not telling us about x/l flags (issue346)
Bryan O'Sullivan <bryano@fb.com>
parents:
diff
changeset
|
47 echo |
|
bd12a4da0f35
replay: workaround svn not telling us about x/l flags (issue346)
Bryan O'Sullivan <bryano@fb.com>
parents:
diff
changeset
|
48 echo 'Complete.' |
|
bd12a4da0f35
replay: workaround svn not telling us about x/l flags (issue346)
Bryan O'Sullivan <bryano@fb.com>
parents:
diff
changeset
|
49 echo 'You probably want to clean up temp now.' |
|
bd12a4da0f35
replay: workaround svn not telling us about x/l flags (issue346)
Bryan O'Sullivan <bryano@fb.com>
parents:
diff
changeset
|
50 echo 'Dump in addspecial.svndump' |
|
bd12a4da0f35
replay: workaround svn not telling us about x/l flags (issue346)
Bryan O'Sullivan <bryano@fb.com>
parents:
diff
changeset
|
51 exit 0 |
