equal
deleted
inserted
replaced
15 mkdir d |
15 mkdir d |
16 echo b > d/b |
16 echo b > d/b |
17 ln -s d dlink |
17 ln -s d dlink |
18 ln -s d dlink2 |
18 ln -s d dlink2 |
19 ln -s d dlink3 |
19 ln -s d dlink3 |
|
20 mkdir d2 |
|
21 echo a > d2/a |
20 cd .. |
22 cd .. |
21 svn add * |
23 svn add * |
22 svn ci -m 'initial' |
24 svn ci -m 'initial' |
23 # Clobber symlink with file with similar content |
25 # Clobber symlink with file with similar content |
24 cd trunk |
26 cd trunk |
48 rcopy trunk/dlink2 trunk/dlink3 |
50 rcopy trunk/dlink2 trunk/dlink3 |
49 EOF |
51 EOF |
50 |
52 |
51 python $RSVN --message=clobber2 --username=evil `pwd`/repo < clobber.rsvn |
53 python $RSVN --message=clobber2 --username=evil `pwd`/repo < clobber.rsvn |
52 |
54 |
|
55 # Create d2 in branch so d2 has 'a' is in branch/d2 and trunk/d2, |
|
56 # 'b' is in trunk/d2 and 'c' is in branch/d2 |
|
57 cd wc/trunk |
|
58 echo b > d2/b |
|
59 svn add d2/b |
|
60 svn ci -m adddb |
|
61 cd .. |
|
62 svn up |
|
63 svn cp trunk branches/branch |
|
64 cd branches/branch |
|
65 svn rm d2/b |
|
66 echo c > d2/c |
|
67 svn add d2/c |
|
68 cd ../.. |
|
69 svn ci -m branch |
|
70 svn up |
|
71 cd .. |
|
72 |
|
73 cat > clobber.rsvn <<EOF |
|
74 rdelete trunk/d2 |
|
75 rcopy branches/branch/d2 trunk/d2 |
|
76 EOF |
|
77 python $RSVN --message=clobberdir --username=evil `pwd`/repo < clobber.rsvn |
|
78 |
53 svn log -v file://`pwd`/repo |
79 svn log -v file://`pwd`/repo |
54 |
80 |
55 svnadmin dump repo > ../replace.svndump |
81 svnadmin dump repo > ../replace.svndump |