Mercurial > hgsubversion
annotate tests/fixtures/renames.sh @ 1235:6b15eeb78c1a
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 | 0d0132cba155 |
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 # |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
3 # Generate renames.svndump |
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 |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
13 mkdir project-orig |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
14 cd project-orig |
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 |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
17 cd .. |
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" |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
22 |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
23 svn co $svnurl project |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
24 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
|
25 # Entries for regular tests |
67
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
26 echo a > a |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
27 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
|
28 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
|
29 ln -s b linkb |
67
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
30 mkdir -p da/db |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
31 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
|
32 ln -s daf da/dalink |
67
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
33 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
|
34 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
|
35 # 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
|
36 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
|
37 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
|
38 mkdir deleteddir |
e0c86ebe05e3
test_fetch_renames: test copy of deleted stuff from the past
Patrick Mezard <pmezard@gmail.com>
parents:
67
diff
changeset
|
39 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
|
40 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
|
41 # 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
|
42 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
|
43 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
|
44 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
|
45 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
|
46 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
|
47 # 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
|
48 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
|
49 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
|
50 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
|
51 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
|
52 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
|
53 # 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
|
54 # 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
|
55 mkdir groupdir |
bf1e8b8ed452
test_fetch_renames: test directory copy with children files changed in-between
Patrick Mezard <pmezard@gmail.com>
parents:
69
diff
changeset
|
56 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
|
57 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
|
58 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
|
59 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
|
60 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
|
61 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
|
62 # 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
|
63 svn rm deletedfile |
e0c86ebe05e3
test_fetch_renames: test copy of deleted stuff from the past
Patrick Mezard <pmezard@gmail.com>
parents:
67
diff
changeset
|
64 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
|
65 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
|
66 # 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
|
67 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
|
68 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
|
69 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
|
70 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
|
71 # 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
|
72 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
|
73 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
|
74 svn ci -m "delete files and dirs" |
67
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
75 cd ../branches |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
76 svn cp ../trunk branch1 |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
77 svn ci -m "create branch1" |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
78 cd branch1 |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
79 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
|
80 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
|
81 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
|
82 svn ci -m "add c and linkc" |
67
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
83 cd ../../trunk |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
84 # Regular copy and rename |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
85 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
|
86 svn cp linka linka1 |
67
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
87 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
|
88 svn mv linka linka2 |
67
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
89 # Copy and update of source and dest |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
90 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
|
91 svn cp linkb linkb1 |
67
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
92 echo b >> b |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
93 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
|
94 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
|
95 ln -sfn bc linkb1 |
67
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
96 # Directory copy and renaming |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
97 svn cp da da1 |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
98 svn mv da da2 |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
99 # Test one copy operation in branch |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
100 cd ../branches/branch1 |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
101 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
|
102 svn cp linkc linkc1 |
67
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
103 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
|
104 ln -sfn cc linkc1 |
67
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
105 cd ../.. |
1233
0d0132cba155
editor: fix edge case with in memory file-store size limit
David Schleimer <dschleimer@fb.com>
parents:
130
diff
changeset
|
106 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
|
107 cd trunk |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
108 # Copy across branch |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
109 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
|
110 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
|
111 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
|
112 # 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
|
113 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
|
114 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
|
115 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
|
116 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
|
117 # 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
|
118 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
|
119 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
|
120 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
|
121 # 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
|
122 # 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
|
123 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
|
124 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
|
125 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
|
126 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
|
127 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
|
128 # 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
|
129 # 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
|
130 # 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
|
131 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
|
132 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
|
133 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
|
134 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
|
135 # 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
|
136 # 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
|
137 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
|
138 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
|
139 cd ../.. |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
140 |
e319c9168910
hg_delta_editor: register svn file copies
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
141 svnadmin dump testrepo > ../renames.svndump |