annotate tests/fixtures/project_name_with_space.sh @ 933:a9f315eae67c

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 c421e6bf0d95
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
512
c421e6bf0d95 tests: test paths with spaces
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
1 #!/bin/sh
c421e6bf0d95 tests: test paths with spaces
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
2 mkdir temp
c421e6bf0d95 tests: test paths with spaces
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
3 cd temp
c421e6bf0d95 tests: test paths with spaces
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
4 svnadmin create repo
c421e6bf0d95 tests: test paths with spaces
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
5 svn co file://`pwd`/repo wc
c421e6bf0d95 tests: test paths with spaces
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
6 cd wc
c421e6bf0d95 tests: test paths with spaces
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
7 mkdir 'project name'
c421e6bf0d95 tests: test paths with spaces
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
8 cd 'project name'
c421e6bf0d95 tests: test paths with spaces
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
9 mkdir branches trunk tags
c421e6bf0d95 tests: test paths with spaces
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
10 cd ..
c421e6bf0d95 tests: test paths with spaces
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
11 svn add *
c421e6bf0d95 tests: test paths with spaces
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
12 svn ci -m 'btt'
c421e6bf0d95 tests: test paths with spaces
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
13
c421e6bf0d95 tests: test paths with spaces
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
14 cd 'project name'/trunk
c421e6bf0d95 tests: test paths with spaces
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
15 for a in alpha beta gamma delta ; do
c421e6bf0d95 tests: test paths with spaces
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
16 echo $a > $a
c421e6bf0d95 tests: test paths with spaces
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
17 svn add $a
c421e6bf0d95 tests: test paths with spaces
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
18 done
c421e6bf0d95 tests: test paths with spaces
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
19 svn ci -m 'Add files.'
c421e6bf0d95 tests: test paths with spaces
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
20
c421e6bf0d95 tests: test paths with spaces
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
21 mkdir al
c421e6bf0d95 tests: test paths with spaces
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
22 echo foo > al/foo
c421e6bf0d95 tests: test paths with spaces
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
23 svn add al
c421e6bf0d95 tests: test paths with spaces
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
24 svn ci -m 'add directory al'
c421e6bf0d95 tests: test paths with spaces
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
25
c421e6bf0d95 tests: test paths with spaces
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
26 cd ..
c421e6bf0d95 tests: test paths with spaces
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
27 svn up
c421e6bf0d95 tests: test paths with spaces
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
28 svn cp trunk branches/dev_branch
c421e6bf0d95 tests: test paths with spaces
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
29 svn ci -m 'branch'
c421e6bf0d95 tests: test paths with spaces
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
30
c421e6bf0d95 tests: test paths with spaces
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
31 cd branches/dev_branch
c421e6bf0d95 tests: test paths with spaces
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
32 svn rm delta
c421e6bf0d95 tests: test paths with spaces
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
33 echo narf > alpha
c421e6bf0d95 tests: test paths with spaces
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
34 echo iota > iota
c421e6bf0d95 tests: test paths with spaces
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
35 svn add iota
c421e6bf0d95 tests: test paths with spaces
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
36 svn ci -m 'branch changes'
c421e6bf0d95 tests: test paths with spaces
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
37
c421e6bf0d95 tests: test paths with spaces
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
38 cd ../../../../..
c421e6bf0d95 tests: test paths with spaces
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
39 svnadmin dump temp/repo > project_name_with_space.svndump
c421e6bf0d95 tests: test paths with spaces
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
40
c421e6bf0d95 tests: test paths with spaces
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
41 echo
c421e6bf0d95 tests: test paths with spaces
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
42 echo 'Complete.'
c421e6bf0d95 tests: test paths with spaces
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
43 echo 'You probably want to clean up temp now.'
c421e6bf0d95 tests: test paths with spaces
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
44 echo 'Dump in project_name_with_space.svndump'
c421e6bf0d95 tests: test paths with spaces
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
45
c421e6bf0d95 tests: test paths with spaces
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
46 exit 0