Mercurial > hgsubversion

annotate tests/fixtures/delentries.sh @ 1028:c4b25a903ad3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
layouts: consistently return None for default branch This makes the single and standard layouts consistent in what they return for the default branch. Previously, single had returned 'default' now they both return None. In addition, this fixes a now-exposed bug in stupid's convert_revision logic. Specifically, when a file is replaced by another file within the same branch, we treated that as replacing the entire branch. this bug was previously hidden because meta.split_branch_path and meta.localname were inconsistent in what they returned for the single layout. meta.split-branch_path is used to maintain the set of known branches, where meta.localname is used to determine the branch for the path being replaced. This resulted in erroneously hitting the condition that skipped paths outside branches we know about when considering replace operations from svn.
author David Schleimer <dschleimer@fb.com>
date Wed, 05 Jun 2013 11:00:06 -0700
parents 19aabf67c792
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
144
19aabf67c792 test_fetch_command: test file and directory deletions
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
1 #!/bin/sh
19aabf67c792 test_fetch_command: test file and directory deletions
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
2 #
19aabf67c792 test_fetch_command: test file and directory deletions
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
3 # Generate delentries.svndump
19aabf67c792 test_fetch_command: test file and directory deletions
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
4 #
19aabf67c792 test_fetch_command: test file and directory deletions
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
5
19aabf67c792 test_fetch_command: test file and directory deletions
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
6 mkdir temp
19aabf67c792 test_fetch_command: test file and directory deletions
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
7 cd temp
19aabf67c792 test_fetch_command: test file and directory deletions
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
8
19aabf67c792 test_fetch_command: test file and directory deletions
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
9 mkdir project-orig
19aabf67c792 test_fetch_command: test file and directory deletions
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
10 cd project-orig
19aabf67c792 test_fetch_command: test file and directory deletions
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
11 mkdir trunk
19aabf67c792 test_fetch_command: test file and directory deletions
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
12 cd ..
19aabf67c792 test_fetch_command: test file and directory deletions
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
13
19aabf67c792 test_fetch_command: test file and directory deletions
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
14 svnadmin create testrepo
19aabf67c792 test_fetch_command: test file and directory deletions
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
15 svnurl=file://`pwd`/testrepo
19aabf67c792 test_fetch_command: test file and directory deletions
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
16 svn import project-orig $svnurl -m "init project"
19aabf67c792 test_fetch_command: test file and directory deletions
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
17
19aabf67c792 test_fetch_command: test file and directory deletions
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
18 svn co $svnurl project
19aabf67c792 test_fetch_command: test file and directory deletions
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
19 cd project/trunk
19aabf67c792 test_fetch_command: test file and directory deletions
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
20 # Regular file deletion
19aabf67c792 test_fetch_command: test file and directory deletions
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
21 echo a > a
19aabf67c792 test_fetch_command: test file and directory deletions
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
22 # Another file starting like the deleted file
19aabf67c792 test_fetch_command: test file and directory deletions
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
23 echo aa > aa
19aabf67c792 test_fetch_command: test file and directory deletions
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
24 mkdir d1
19aabf67c792 test_fetch_command: test file and directory deletions
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
25 mkdir d1/d2
19aabf67c792 test_fetch_command: test file and directory deletions
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
26 mkdir d1/d2/d3
19aabf67c792 test_fetch_command: test file and directory deletions
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
27 echo c > d1/c
19aabf67c792 test_fetch_command: test file and directory deletions
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
28 # Test directory deletion
19aabf67c792 test_fetch_command: test file and directory deletions
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
29 echo d > d1/d2/c
19aabf67c792 test_fetch_command: test file and directory deletions
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
30 # Test subdirectory deletion
19aabf67c792 test_fetch_command: test file and directory deletions
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
31 echo e > d1/d2/d3/e
19aabf67c792 test_fetch_command: test file and directory deletions
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
32 echo f > d1/d2/d3/f
19aabf67c792 test_fetch_command: test file and directory deletions
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
33 # This file starts as the deleted directory, can be confusing
19aabf67c792 test_fetch_command: test file and directory deletions
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
34 echo d2prefix > d1/d2prefix
19aabf67c792 test_fetch_command: test file and directory deletions
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
35 svn add a aa d1
19aabf67c792 test_fetch_command: test file and directory deletions
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
36 svn ci -m "add entries"
19aabf67c792 test_fetch_command: test file and directory deletions
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
37 svn rm a d1/d2
19aabf67c792 test_fetch_command: test file and directory deletions
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
38 svn ci -m "remove entries"
19aabf67c792 test_fetch_command: test file and directory deletions
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
39 cd ../..
19aabf67c792 test_fetch_command: test file and directory deletions
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
40
19aabf67c792 test_fetch_command: test file and directory deletions
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
41 svnadmin dump testrepo > ../delentries.svndump