Mercurial > hgsubversion

annotate tests/fixtures/spaces-in-path.sh @ 933:a9f315eae67c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
push: use native rebase instead of our rebase wrapper Our rebase wrapper doesn't quite do the right thing with repect to a just-pushed revision. In particular, it will try to rebase the just-pushed revision on top of the version of that revision we just pulled down from svn. This will sometimes result in a local revision with an identical commit message as the revision from svn, but no file changes. This changes the rebase portion of the push command to instead use the native rebase with a revset that excludes the revision we just pushed to svn from the set to be rebased. It also moves to a single strip operation that removes all of the revisions based on a pre-push or partially pushed revision. This moves to a separate rebase and strip operation since we now need to strip revisions we are not rebasing.
author David Schleimer <dschleimer@fb.com>
date Mon, 24 Sep 2012 10:18:28 -0700
parents a739568f8d48
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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