Mercurial > hgsubversion

annotate tests/fixtures/branchtagcollision.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 f28e0f54a6ef
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
821
f28e0f54a6ef svnmeta: store youngest revision pulled from subversion
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
1 #!/bin/bash
f28e0f54a6ef svnmeta: store youngest revision pulled from subversion
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
2 #
f28e0f54a6ef svnmeta: store youngest revision pulled from subversion
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
3 # Generate branchtagcollision.svndump
f28e0f54a6ef svnmeta: store youngest revision pulled from subversion
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
4 #
f28e0f54a6ef svnmeta: store youngest revision pulled from subversion
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
5 # Generates an svn repository with a branch and a tag that have the same name.
f28e0f54a6ef svnmeta: store youngest revision pulled from subversion
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
6
f28e0f54a6ef svnmeta: store youngest revision pulled from subversion
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
7
f28e0f54a6ef svnmeta: store youngest revision pulled from subversion
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
8 mkdir temp
f28e0f54a6ef svnmeta: store youngest revision pulled from subversion
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
9 cd temp
f28e0f54a6ef svnmeta: store youngest revision pulled from subversion
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
10
f28e0f54a6ef svnmeta: store youngest revision pulled from subversion
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
11 svnadmin create testrepo
f28e0f54a6ef svnmeta: store youngest revision pulled from subversion
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
12 svn checkout file://`pwd`/testrepo client
f28e0f54a6ef svnmeta: store youngest revision pulled from subversion
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
13
f28e0f54a6ef svnmeta: store youngest revision pulled from subversion
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
14 cd client
f28e0f54a6ef svnmeta: store youngest revision pulled from subversion
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
15 mkdir trunk
f28e0f54a6ef svnmeta: store youngest revision pulled from subversion
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
16 mkdir branches
f28e0f54a6ef svnmeta: store youngest revision pulled from subversion
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
17 mkdir tags
f28e0f54a6ef svnmeta: store youngest revision pulled from subversion
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
18
f28e0f54a6ef svnmeta: store youngest revision pulled from subversion
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
19 svn add trunk branches tags
f28e0f54a6ef svnmeta: store youngest revision pulled from subversion
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
20 svn commit -m "Initial commit"
f28e0f54a6ef svnmeta: store youngest revision pulled from subversion
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
21
f28e0f54a6ef svnmeta: store youngest revision pulled from subversion
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
22 echo "fileA" >> trunk/fileA
f28e0f54a6ef svnmeta: store youngest revision pulled from subversion
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
23 svn add trunk/fileA
f28e0f54a6ef svnmeta: store youngest revision pulled from subversion
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
24 svn commit -m "Added fileA"
f28e0f54a6ef svnmeta: store youngest revision pulled from subversion
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
25
f28e0f54a6ef svnmeta: store youngest revision pulled from subversion
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
26 svn cp trunk branches/A
f28e0f54a6ef svnmeta: store youngest revision pulled from subversion
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
27 svn commit -m "added branch"
f28e0f54a6ef svnmeta: store youngest revision pulled from subversion
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
28
f28e0f54a6ef svnmeta: store youngest revision pulled from subversion
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
29 echo "fileB" >> trunk/fileB
f28e0f54a6ef svnmeta: store youngest revision pulled from subversion
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
30 svn add trunk/fileB
f28e0f54a6ef svnmeta: store youngest revision pulled from subversion
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
31 svn commit -m "Added fileB"
f28e0f54a6ef svnmeta: store youngest revision pulled from subversion
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
32
f28e0f54a6ef svnmeta: store youngest revision pulled from subversion
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
33 svn cp trunk tags/A
f28e0f54a6ef svnmeta: store youngest revision pulled from subversion
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
34 svn commit -m "added bad tag"
f28e0f54a6ef svnmeta: store youngest revision pulled from subversion
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
35
f28e0f54a6ef svnmeta: store youngest revision pulled from subversion
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
36 cd ..
f28e0f54a6ef svnmeta: store youngest revision pulled from subversion
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
37 svnadmin dump testrepo > ../branchtagcollision.svndump