Mercurial > hgsubversion

annotate tests/fixtures/branch_create_with_dir_delete.sh @ 1235:6b15eeb78c1a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
editor: fix replay handling for copied + modified symlinks We strip the 'link ' prefix from symlinks when we store it in Mercurial. We reapply it when we start editing the file via open_file, but not via add_file. this means that modified symlniks would replay correctly, but not copied and modified symlinks. This corrects that ommission.
author David Schleimer <dschleimer@fb.com>
date Mon, 07 Apr 2014 18:44:46 -0700
parents c0063328587f
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
232
c0063328587f Fix and test for directory deletes during branch creation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
1 #!/bin/sh
c0063328587f Fix and test for directory deletes during branch creation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
2 mkdir temp
c0063328587f Fix and test for directory deletes during branch creation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
3 cd temp
c0063328587f Fix and test for directory deletes during branch creation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
4 svnadmin create repo
c0063328587f Fix and test for directory deletes during branch creation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
5 svn co file://`pwd`/repo wc
c0063328587f Fix and test for directory deletes during branch creation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
6 cd wc
c0063328587f Fix and test for directory deletes during branch creation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
7 mkdir branches trunk tags
c0063328587f Fix and test for directory deletes during branch creation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
8 svn add *
c0063328587f Fix and test for directory deletes during branch creation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
9 svn ci -m 'btt'
c0063328587f Fix and test for directory deletes during branch creation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
10 cd trunk
c0063328587f Fix and test for directory deletes during branch creation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
11 for a in alpha beta gamma delta ; do
c0063328587f Fix and test for directory deletes during branch creation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
12 echo $a > $a
c0063328587f Fix and test for directory deletes during branch creation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
13 svn add $a
c0063328587f Fix and test for directory deletes during branch creation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
14 done
c0063328587f Fix and test for directory deletes during branch creation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
15 svn ci -m 'Add files.'
c0063328587f Fix and test for directory deletes during branch creation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
16 mkdir al
c0063328587f Fix and test for directory deletes during branch creation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
17 echo foo > al/foo
c0063328587f Fix and test for directory deletes during branch creation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
18 svn add al
c0063328587f Fix and test for directory deletes during branch creation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
19 svn ci -m 'add directory al to delete on the branch'
c0063328587f Fix and test for directory deletes during branch creation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
20 cd ..
c0063328587f Fix and test for directory deletes during branch creation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
21 svn up
c0063328587f Fix and test for directory deletes during branch creation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
22 svn cp trunk branches/dev_branch
c0063328587f Fix and test for directory deletes during branch creation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
23 svn rm branches/dev_branch/al
c0063328587f Fix and test for directory deletes during branch creation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
24 svn ci -m 'branch'
c0063328587f Fix and test for directory deletes during branch creation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
25 cd branches/dev_branch
c0063328587f Fix and test for directory deletes during branch creation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
26 svn rm delta
c0063328587f Fix and test for directory deletes during branch creation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
27 echo narf > alpha
c0063328587f Fix and test for directory deletes during branch creation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
28 echo iota > iota
c0063328587f Fix and test for directory deletes during branch creation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
29 svn add iota
c0063328587f Fix and test for directory deletes during branch creation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
30 svn ci -m 'branch changes'
c0063328587f Fix and test for directory deletes during branch creation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
31 cd ../../../..
c0063328587f Fix and test for directory deletes during branch creation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
32 svnadmin dump temp/repo > branch_create_with_dir_delete.svndump
c0063328587f Fix and test for directory deletes during branch creation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
33 echo
c0063328587f Fix and test for directory deletes during branch creation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
34 echo 'Complete.'
c0063328587f Fix and test for directory deletes during branch creation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
35 echo 'You probably want to clean up temp now.'
c0063328587f Fix and test for directory deletes during branch creation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
36 echo 'Dump in branch_create_with_dir_delete.svndump'
c0063328587f Fix and test for directory deletes during branch creation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
37 exit 0