Mercurial > hgsubversion
annotate tests/fixtures/spaces-in-path.sh @ 1340:db9d85618d3d
wrapper: delay marker creation in push
Before this patch we were creating obsolescence markers when pulling the
changesets from subversion. The counterpart stripping logic (when obsolescence
is not available) was done after pushing everything.
This patch moves the marker creation to the end of the push, to:
1) Make the code more readable (the marker creation and the stripping should
be in the same place)
2) Fix a behavior issue with inhibit(evolve) (see below)
With inhibit + hgsubversion enabled. When pushing to subversion we were
creating markers as expected but inhibiting the marker on the commit that was
the parent of the working copy making it therefore visible.
By delaying the marker creation to after the update we avoid this issue.
author | Laurent Charignon <lcharignon@fb.com> |
---|---|
date | Wed, 08 Jul 2015 13:30:16 -0700 |
parents | a739568f8d48 |
children |
rev | line source |
---|---|
488
a739568f8d48
Add a test for URLs that have spaces in them.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
1 #!/bin/sh |
a739568f8d48
Add a test for URLs that have spaces in them.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
2 mkdir temp |
a739568f8d48
Add a test for URLs that have spaces in them.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
3 cd temp |
a739568f8d48
Add a test for URLs that have spaces in them.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
4 svnadmin create repo |
a739568f8d48
Add a test for URLs that have spaces in them.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
5 svn co file://`pwd`/repo wc |
a739568f8d48
Add a test for URLs that have spaces in them.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
6 cd wc |
a739568f8d48
Add a test for URLs that have spaces in them.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
7 mkdir branches trunk tags |
a739568f8d48
Add a test for URLs that have spaces in them.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
8 mkdir tags/versions |
a739568f8d48
Add a test for URLs that have spaces in them.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
9 mkdir tags/blah |
a739568f8d48
Add a test for URLs that have spaces in them.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
10 svn add * |
a739568f8d48
Add a test for URLs that have spaces in them.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
11 svn ci -m 'btt' |
a739568f8d48
Add a test for URLs that have spaces in them.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
12 cd trunk |
a739568f8d48
Add a test for URLs that have spaces in them.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
13 for a in alpha beta gamma delta ; do |
a739568f8d48
Add a test for URLs that have spaces in them.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
14 echo $a > $a |
a739568f8d48
Add a test for URLs that have spaces in them.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
15 svn add $a |
a739568f8d48
Add a test for URLs that have spaces in them.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
16 done |
a739568f8d48
Add a test for URLs that have spaces in them.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
17 svn ci -m 'Add files.' |
a739568f8d48
Add a test for URLs that have spaces in them.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
18 |
a739568f8d48
Add a test for URLs that have spaces in them.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
19 echo 'foo bar' > 'foo bar' |
a739568f8d48
Add a test for URLs that have spaces in them.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
20 svn add 'foo bar' |
a739568f8d48
Add a test for URLs that have spaces in them.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
21 svn ci -m 'Add files.' |
a739568f8d48
Add a test for URLs that have spaces in them.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
22 |
a739568f8d48
Add a test for URLs that have spaces in them.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
23 mkdir 'blah blah' |
a739568f8d48
Add a test for URLs that have spaces in them.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
24 echo 'another file' > 'blah blah/another file' |
a739568f8d48
Add a test for URLs that have spaces in them.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
25 svn add 'blah blah' |
a739568f8d48
Add a test for URLs that have spaces in them.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
26 svn ci -m 'Add files.' |
a739568f8d48
Add a test for URLs that have spaces in them.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
27 |
a739568f8d48
Add a test for URLs that have spaces in them.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
28 cd .. |
a739568f8d48
Add a test for URLs that have spaces in them.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
29 svn up |
a739568f8d48
Add a test for URLs that have spaces in them.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
30 svn cp trunk branches/dev_branch |
a739568f8d48
Add a test for URLs that have spaces in them.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
31 svn ci -m 'Make a branch' |
a739568f8d48
Add a test for URLs that have spaces in them.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
32 cd ../.. |
a739568f8d48
Add a test for URLs that have spaces in them.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
33 |
a739568f8d48
Add a test for URLs that have spaces in them.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
34 svnadmin dump temp/repo > spaces-in-path.svndump |
a739568f8d48
Add a test for URLs that have spaces in them.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
35 echo |
a739568f8d48
Add a test for URLs that have spaces in them.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
36 echo 'Complete.' |
a739568f8d48
Add a test for URLs that have spaces in them.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
37 echo 'You probably want to clean up temp now.' |
a739568f8d48
Add a test for URLs that have spaces in them.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
38 echo 'Dump in spaces-in-path.svndump' |
a739568f8d48
Add a test for URLs that have spaces in them.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
39 exit 0 |