Mercurial > hgsubversion
annotate tests/fixtures/renames_with_prefix.sh @ 1588:e2d38f6b8afe
tests: make output comaptible with hash changes in hg-4.8
46da52f4b820 in core mercurial added logic to try hard to reuse manifest if we
can. In the tests of hgsubversion, there are lot of cases we create an empty
commit with just branch name changed. In hg < 4.8, hgsubversion used to create a
new manifest entry for that commit but after that patch, empty commit started
using the manifest of the parent leading to hash change.
author | Pulkit Goyal <pulkit@yandex-team.ru> |
---|---|
date | Wed, 31 Oct 2018 17:04:57 +0300 |
parents | d3c79072bc6a |
children |
rev | line source |
---|---|
67
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
1 #!/bin/sh |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
2 # |
1234
d3c79072bc6a
editor: correctly import symlink copy+modify with non-empty prefix
David Schleimer <dschleimer@fb.com>
parents:
1233
diff
changeset
|
3 # Generate renames_with_prefix.svndump |
67
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
4 # |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
5 |
1233
0d0132cba155
editor: fix edge case with in memory file-store size limit
David Schleimer <dschleimer@fb.com>
parents:
130
diff
changeset
|
6 set -e |
0d0132cba155
editor: fix edge case with in memory file-store size limit
David Schleimer <dschleimer@fb.com>
parents:
130
diff
changeset
|
7 |
0d0132cba155
editor: fix edge case with in memory file-store size limit
David Schleimer <dschleimer@fb.com>
parents:
130
diff
changeset
|
8 rm -rf temp |
0d0132cba155
editor: fix edge case with in memory file-store size limit
David Schleimer <dschleimer@fb.com>
parents:
130
diff
changeset
|
9 |
67
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
10 mkdir temp |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
11 cd temp |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
12 |
1234
d3c79072bc6a
editor: correctly import symlink copy+modify with non-empty prefix
David Schleimer <dschleimer@fb.com>
parents:
1233
diff
changeset
|
13 mkdir -p project-orig/prefix |
d3c79072bc6a
editor: correctly import symlink copy+modify with non-empty prefix
David Schleimer <dschleimer@fb.com>
parents:
1233
diff
changeset
|
14 cd project-orig/prefix |
67
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
15 mkdir trunk |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
16 mkdir branches |
1234
d3c79072bc6a
editor: correctly import symlink copy+modify with non-empty prefix
David Schleimer <dschleimer@fb.com>
parents:
1233
diff
changeset
|
17 cd ../.. |
67
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
18 |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
19 svnadmin create testrepo |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
20 svnurl=file://`pwd`/testrepo |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
21 svn import project-orig $svnurl -m "init project" |
1234
d3c79072bc6a
editor: correctly import symlink copy+modify with non-empty prefix
David Schleimer <dschleimer@fb.com>
parents:
1233
diff
changeset
|
22 svnurl=$svnurl/prefix |
67
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
23 |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
24 svn co $svnurl project |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
25 cd project/trunk |
69
63ece4ea25c9
hg_delta_editor: register copies only if files are unchanged between source and dest
Patrick Mezard <pmezard@gmail.com>
parents:
68
diff
changeset
|
26 # Entries for regular tests |
67
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
27 echo a > a |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
28 echo b > b |
1233
0d0132cba155
editor: fix edge case with in memory file-store size limit
David Schleimer <dschleimer@fb.com>
parents:
130
diff
changeset
|
29 ln -s a linka |
0d0132cba155
editor: fix edge case with in memory file-store size limit
David Schleimer <dschleimer@fb.com>
parents:
130
diff
changeset
|
30 ln -s b linkb |
67
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
31 mkdir -p da/db |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
32 echo c > da/daf |
1233
0d0132cba155
editor: fix edge case with in memory file-store size limit
David Schleimer <dschleimer@fb.com>
parents:
130
diff
changeset
|
33 ln -s daf da/dalink |
67
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
34 echo d > da/db/dbf |
1233
0d0132cba155
editor: fix edge case with in memory file-store size limit
David Schleimer <dschleimer@fb.com>
parents:
130
diff
changeset
|
35 ln -s ../daf da/db/dblink |
69
63ece4ea25c9
hg_delta_editor: register copies only if files are unchanged between source and dest
Patrick Mezard <pmezard@gmail.com>
parents:
68
diff
changeset
|
36 # Entries to test delete + copy |
68
e0c86ebe05e3
test_fetch_renames: test copy of deleted stuff from the past
Patrick Mezard <pmezard@gmail.com>
parents:
67
diff
changeset
|
37 echo deleted > deletedfile |
1233
0d0132cba155
editor: fix edge case with in memory file-store size limit
David Schleimer <dschleimer@fb.com>
parents:
130
diff
changeset
|
38 ln -s b deletedlink |
68
e0c86ebe05e3
test_fetch_renames: test copy of deleted stuff from the past
Patrick Mezard <pmezard@gmail.com>
parents:
67
diff
changeset
|
39 mkdir deleteddir |
e0c86ebe05e3
test_fetch_renames: test copy of deleted stuff from the past
Patrick Mezard <pmezard@gmail.com>
parents:
67
diff
changeset
|
40 echo deleteddir > deleteddir/f |
1233
0d0132cba155
editor: fix edge case with in memory file-store size limit
David Schleimer <dschleimer@fb.com>
parents:
130
diff
changeset
|
41 ln -s f deleteddir/link |
69
63ece4ea25c9
hg_delta_editor: register copies only if files are unchanged between source and dest
Patrick Mezard <pmezard@gmail.com>
parents:
68
diff
changeset
|
42 # Entries to test copy before change |
63ece4ea25c9
hg_delta_editor: register copies only if files are unchanged between source and dest
Patrick Mezard <pmezard@gmail.com>
parents:
68
diff
changeset
|
43 echo changed > changed |
1233
0d0132cba155
editor: fix edge case with in memory file-store size limit
David Schleimer <dschleimer@fb.com>
parents:
130
diff
changeset
|
44 ln -s changed changedlink |
69
63ece4ea25c9
hg_delta_editor: register copies only if files are unchanged between source and dest
Patrick Mezard <pmezard@gmail.com>
parents:
68
diff
changeset
|
45 mkdir changeddir |
63ece4ea25c9
hg_delta_editor: register copies only if files are unchanged between source and dest
Patrick Mezard <pmezard@gmail.com>
parents:
68
diff
changeset
|
46 echo changed2 > changeddir/f |
1233
0d0132cba155
editor: fix edge case with in memory file-store size limit
David Schleimer <dschleimer@fb.com>
parents:
130
diff
changeset
|
47 ln -s f changeddir/link |
69
63ece4ea25c9
hg_delta_editor: register copies only if files are unchanged between source and dest
Patrick Mezard <pmezard@gmail.com>
parents:
68
diff
changeset
|
48 # Entries unchanged in the rest of history |
63ece4ea25c9
hg_delta_editor: register copies only if files are unchanged between source and dest
Patrick Mezard <pmezard@gmail.com>
parents:
68
diff
changeset
|
49 echo unchanged > unchanged |
1233
0d0132cba155
editor: fix edge case with in memory file-store size limit
David Schleimer <dschleimer@fb.com>
parents:
130
diff
changeset
|
50 ln -s unchanged unchangedlink |
69
63ece4ea25c9
hg_delta_editor: register copies only if files are unchanged between source and dest
Patrick Mezard <pmezard@gmail.com>
parents:
68
diff
changeset
|
51 mkdir unchangeddir |
63ece4ea25c9
hg_delta_editor: register copies only if files are unchanged between source and dest
Patrick Mezard <pmezard@gmail.com>
parents:
68
diff
changeset
|
52 echo unchanged2 > unchangeddir/f |
1233
0d0132cba155
editor: fix edge case with in memory file-store size limit
David Schleimer <dschleimer@fb.com>
parents:
130
diff
changeset
|
53 ln -s f unchangeddir/link |
71
bf1e8b8ed452
test_fetch_renames: test directory copy with children files changed in-between
Patrick Mezard <pmezard@gmail.com>
parents:
69
diff
changeset
|
54 # One of the files will be changed afterwards, to test |
bf1e8b8ed452
test_fetch_renames: test directory copy with children files changed in-between
Patrick Mezard <pmezard@gmail.com>
parents:
69
diff
changeset
|
55 # group copies detection |
bf1e8b8ed452
test_fetch_renames: test directory copy with children files changed in-between
Patrick Mezard <pmezard@gmail.com>
parents:
69
diff
changeset
|
56 mkdir groupdir |
bf1e8b8ed452
test_fetch_renames: test directory copy with children files changed in-between
Patrick Mezard <pmezard@gmail.com>
parents:
69
diff
changeset
|
57 echo a > groupdir/a |
bf1e8b8ed452
test_fetch_renames: test directory copy with children files changed in-between
Patrick Mezard <pmezard@gmail.com>
parents:
69
diff
changeset
|
58 echo b > groupdir/b |
1233
0d0132cba155
editor: fix edge case with in memory file-store size limit
David Schleimer <dschleimer@fb.com>
parents:
130
diff
changeset
|
59 ln -s a groupdir/linka |
0d0132cba155
editor: fix edge case with in memory file-store size limit
David Schleimer <dschleimer@fb.com>
parents:
130
diff
changeset
|
60 ln -s b groupdir/linkb |
0d0132cba155
editor: fix edge case with in memory file-store size limit
David Schleimer <dschleimer@fb.com>
parents:
130
diff
changeset
|
61 svn add a b linka linkb da deleted* changed* unchanged* groupdir |
0d0132cba155
editor: fix edge case with in memory file-store size limit
David Schleimer <dschleimer@fb.com>
parents:
130
diff
changeset
|
62 svn ci -m "add everything" |
69
63ece4ea25c9
hg_delta_editor: register copies only if files are unchanged between source and dest
Patrick Mezard <pmezard@gmail.com>
parents:
68
diff
changeset
|
63 # Remove files to be copied later |
68
e0c86ebe05e3
test_fetch_renames: test copy of deleted stuff from the past
Patrick Mezard <pmezard@gmail.com>
parents:
67
diff
changeset
|
64 svn rm deletedfile |
e0c86ebe05e3
test_fetch_renames: test copy of deleted stuff from the past
Patrick Mezard <pmezard@gmail.com>
parents:
67
diff
changeset
|
65 svn rm deleteddir |
1233
0d0132cba155
editor: fix edge case with in memory file-store size limit
David Schleimer <dschleimer@fb.com>
parents:
130
diff
changeset
|
66 svn rm deletedlink |
69
63ece4ea25c9
hg_delta_editor: register copies only if files are unchanged between source and dest
Patrick Mezard <pmezard@gmail.com>
parents:
68
diff
changeset
|
67 # Update files to be copied before this change |
63ece4ea25c9
hg_delta_editor: register copies only if files are unchanged between source and dest
Patrick Mezard <pmezard@gmail.com>
parents:
68
diff
changeset
|
68 echo changed >> changed |
63ece4ea25c9
hg_delta_editor: register copies only if files are unchanged between source and dest
Patrick Mezard <pmezard@gmail.com>
parents:
68
diff
changeset
|
69 echo changed2 >> changeddir/f |
1233
0d0132cba155
editor: fix edge case with in memory file-store size limit
David Schleimer <dschleimer@fb.com>
parents:
130
diff
changeset
|
70 ln -sfn changeddir/f changedlink |
0d0132cba155
editor: fix edge case with in memory file-store size limit
David Schleimer <dschleimer@fb.com>
parents:
130
diff
changeset
|
71 ln -sfn ../changed changeddir/link |
71
bf1e8b8ed452
test_fetch_renames: test directory copy with children files changed in-between
Patrick Mezard <pmezard@gmail.com>
parents:
69
diff
changeset
|
72 # Update one of the groupdir files |
bf1e8b8ed452
test_fetch_renames: test directory copy with children files changed in-between
Patrick Mezard <pmezard@gmail.com>
parents:
69
diff
changeset
|
73 echo a >> groupdir/a |
1233
0d0132cba155
editor: fix edge case with in memory file-store size limit
David Schleimer <dschleimer@fb.com>
parents:
130
diff
changeset
|
74 ln -sfn ../a groupdir/linka |
68
e0c86ebe05e3
test_fetch_renames: test copy of deleted stuff from the past
Patrick Mezard <pmezard@gmail.com>
parents:
67
diff
changeset
|
75 svn ci -m "delete files and dirs" |
67
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
76 cd ../branches |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
77 svn cp ../trunk branch1 |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
78 svn ci -m "create branch1" |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
79 cd branch1 |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
80 echo c > c |
1233
0d0132cba155
editor: fix edge case with in memory file-store size limit
David Schleimer <dschleimer@fb.com>
parents:
130
diff
changeset
|
81 ln -s c linkc |
0d0132cba155
editor: fix edge case with in memory file-store size limit
David Schleimer <dschleimer@fb.com>
parents:
130
diff
changeset
|
82 svn add c linkc |
0d0132cba155
editor: fix edge case with in memory file-store size limit
David Schleimer <dschleimer@fb.com>
parents:
130
diff
changeset
|
83 svn ci -m "add c and linkc" |
67
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
84 cd ../../trunk |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
85 # Regular copy and rename |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
86 svn cp a a1 |
1233
0d0132cba155
editor: fix edge case with in memory file-store size limit
David Schleimer <dschleimer@fb.com>
parents:
130
diff
changeset
|
87 svn cp linka linka1 |
67
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
88 svn mv a a2 |
1233
0d0132cba155
editor: fix edge case with in memory file-store size limit
David Schleimer <dschleimer@fb.com>
parents:
130
diff
changeset
|
89 svn mv linka linka2 |
67
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
90 # Copy and update of source and dest |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
91 svn cp b b1 |
1233
0d0132cba155
editor: fix edge case with in memory file-store size limit
David Schleimer <dschleimer@fb.com>
parents:
130
diff
changeset
|
92 svn cp linkb linkb1 |
67
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
93 echo b >> b |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
94 echo c >> b1 |
1233
0d0132cba155
editor: fix edge case with in memory file-store size limit
David Schleimer <dschleimer@fb.com>
parents:
130
diff
changeset
|
95 ln -sfn bb linkb |
0d0132cba155
editor: fix edge case with in memory file-store size limit
David Schleimer <dschleimer@fb.com>
parents:
130
diff
changeset
|
96 ln -sfn bc linkb1 |
67
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
97 # Directory copy and renaming |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
98 svn cp da da1 |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
99 svn mv da da2 |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
100 # Test one copy operation in branch |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
101 cd ../branches/branch1 |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
102 svn cp c c1 |
1233
0d0132cba155
editor: fix edge case with in memory file-store size limit
David Schleimer <dschleimer@fb.com>
parents:
130
diff
changeset
|
103 svn cp linkc linkc1 |
67
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
104 echo c >> c1 |
1233
0d0132cba155
editor: fix edge case with in memory file-store size limit
David Schleimer <dschleimer@fb.com>
parents:
130
diff
changeset
|
105 ln -sfn cc linkc1 |
67
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
106 cd ../.. |
1233
0d0132cba155
editor: fix edge case with in memory file-store size limit
David Schleimer <dschleimer@fb.com>
parents:
130
diff
changeset
|
107 svn ci -m "rename and copy a, b, c and da, plus their links" |
67
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
108 cd trunk |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
109 # Copy across branch |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
110 svn cp ../branches/branch1/c c |
1233
0d0132cba155
editor: fix edge case with in memory file-store size limit
David Schleimer <dschleimer@fb.com>
parents:
130
diff
changeset
|
111 svn cp ../branches/branch1/linkc linkc |
0d0132cba155
editor: fix edge case with in memory file-store size limit
David Schleimer <dschleimer@fb.com>
parents:
130
diff
changeset
|
112 svn ci -m "copy c from branch1" |
68
e0c86ebe05e3
test_fetch_renames: test copy of deleted stuff from the past
Patrick Mezard <pmezard@gmail.com>
parents:
67
diff
changeset
|
113 # Copy deleted stuff from the past |
e0c86ebe05e3
test_fetch_renames: test copy of deleted stuff from the past
Patrick Mezard <pmezard@gmail.com>
parents:
67
diff
changeset
|
114 svn cp $svnurl/trunk/deletedfile@2 deletedfile |
e0c86ebe05e3
test_fetch_renames: test copy of deleted stuff from the past
Patrick Mezard <pmezard@gmail.com>
parents:
67
diff
changeset
|
115 svn cp $svnurl/trunk/deleteddir@2 deleteddir |
1233
0d0132cba155
editor: fix edge case with in memory file-store size limit
David Schleimer <dschleimer@fb.com>
parents:
130
diff
changeset
|
116 svn cp $svnurl/trunk/deletedlink@2 deletedlink |
68
e0c86ebe05e3
test_fetch_renames: test copy of deleted stuff from the past
Patrick Mezard <pmezard@gmail.com>
parents:
67
diff
changeset
|
117 svn ci -m "copy stuff from the past" |
69
63ece4ea25c9
hg_delta_editor: register copies only if files are unchanged between source and dest
Patrick Mezard <pmezard@gmail.com>
parents:
68
diff
changeset
|
118 # Copy data from the past before it was changed |
63ece4ea25c9
hg_delta_editor: register copies only if files are unchanged between source and dest
Patrick Mezard <pmezard@gmail.com>
parents:
68
diff
changeset
|
119 svn cp $svnurl/trunk/changed@2 changed2 |
63ece4ea25c9
hg_delta_editor: register copies only if files are unchanged between source and dest
Patrick Mezard <pmezard@gmail.com>
parents:
68
diff
changeset
|
120 svn cp $svnurl/trunk/changeddir@2 changeddir2 |
1233
0d0132cba155
editor: fix edge case with in memory file-store size limit
David Schleimer <dschleimer@fb.com>
parents:
130
diff
changeset
|
121 svn cp $svnurl/trunk/changedlink@2 changedlink2 |
130
c2a84d436202
test_fetch_rename: test content of files coming from the past
Patrick Mezard <pmezard@gmail.com>
parents:
71
diff
changeset
|
122 # Harder, copy from the past before change and change it again |
c2a84d436202
test_fetch_rename: test content of files coming from the past
Patrick Mezard <pmezard@gmail.com>
parents:
71
diff
changeset
|
123 # This confused the stupid diff path |
c2a84d436202
test_fetch_rename: test content of files coming from the past
Patrick Mezard <pmezard@gmail.com>
parents:
71
diff
changeset
|
124 svn cp $svnurl/trunk/changed@2 changed3 |
1233
0d0132cba155
editor: fix edge case with in memory file-store size limit
David Schleimer <dschleimer@fb.com>
parents:
130
diff
changeset
|
125 svn cp $svnurl/trunk/changedlink@2 changedlink3 |
130
c2a84d436202
test_fetch_rename: test content of files coming from the past
Patrick Mezard <pmezard@gmail.com>
parents:
71
diff
changeset
|
126 echo changed3 >> changed3 |
1233
0d0132cba155
editor: fix edge case with in memory file-store size limit
David Schleimer <dschleimer@fb.com>
parents:
130
diff
changeset
|
127 ln -sfn changed3 changedlink3 |
69
63ece4ea25c9
hg_delta_editor: register copies only if files are unchanged between source and dest
Patrick Mezard <pmezard@gmail.com>
parents:
68
diff
changeset
|
128 svn ci -m "copy stuff from the past before change" |
63ece4ea25c9
hg_delta_editor: register copies only if files are unchanged between source and dest
Patrick Mezard <pmezard@gmail.com>
parents:
68
diff
changeset
|
129 # Copy unchanged stuff from the past. Since no changed occured in these files |
63ece4ea25c9
hg_delta_editor: register copies only if files are unchanged between source and dest
Patrick Mezard <pmezard@gmail.com>
parents:
68
diff
changeset
|
130 # between the source and parent revision, we record them as copy from parent |
63ece4ea25c9
hg_delta_editor: register copies only if files are unchanged between source and dest
Patrick Mezard <pmezard@gmail.com>
parents:
68
diff
changeset
|
131 # instead of source rev. |
63ece4ea25c9
hg_delta_editor: register copies only if files are unchanged between source and dest
Patrick Mezard <pmezard@gmail.com>
parents:
68
diff
changeset
|
132 svn cp $svnurl/trunk/unchanged@2 unchanged2 |
63ece4ea25c9
hg_delta_editor: register copies only if files are unchanged between source and dest
Patrick Mezard <pmezard@gmail.com>
parents:
68
diff
changeset
|
133 svn cp $svnurl/trunk/unchangeddir@2 unchangeddir2 |
1233
0d0132cba155
editor: fix edge case with in memory file-store size limit
David Schleimer <dschleimer@fb.com>
parents:
130
diff
changeset
|
134 svn cp $svnurl/trunk/unchangedlink@2 unchangedlink2 |
69
63ece4ea25c9
hg_delta_editor: register copies only if files are unchanged between source and dest
Patrick Mezard <pmezard@gmail.com>
parents:
68
diff
changeset
|
135 svn ci -m "copy unchanged stuff from the past" |
71
bf1e8b8ed452
test_fetch_renames: test directory copy with children files changed in-between
Patrick Mezard <pmezard@gmail.com>
parents:
69
diff
changeset
|
136 # Copy groupdir, unfortunately one file was changed after r2 so the |
bf1e8b8ed452
test_fetch_renames: test directory copy with children files changed in-between
Patrick Mezard <pmezard@gmail.com>
parents:
69
diff
changeset
|
137 # copy should not be recorded at all |
bf1e8b8ed452
test_fetch_renames: test directory copy with children files changed in-between
Patrick Mezard <pmezard@gmail.com>
parents:
69
diff
changeset
|
138 svn cp $svnurl/trunk/groupdir@2 groupdir2 |
bf1e8b8ed452
test_fetch_renames: test directory copy with children files changed in-between
Patrick Mezard <pmezard@gmail.com>
parents:
69
diff
changeset
|
139 svn ci -m "copy groupdir from the past" |
67
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
140 cd ../.. |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
141 |
1234
d3c79072bc6a
editor: correctly import symlink copy+modify with non-empty prefix
David Schleimer <dschleimer@fb.com>
parents:
1233
diff
changeset
|
142 svnadmin dump testrepo > ../renames_with_prefix.svndump |