Mercurial > hgsubversion

comparison tests/fixtures/renames.sh @ 71:bf1e8b8ed452

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test_fetch_renames: test directory copy with children files changed in-between
author Patrick Mezard <pmezard@gmail.com>
date Wed, 05 Nov 2008 13:37:08 +0100
parents 63ece4ea25c9
children c2a84d436202
comparison
equal deleted inserted replaced
70:49b7cbe4c8e3 71:bf1e8b8ed452
34 echo changed2 > changeddir/f 34 echo changed2 > changeddir/f
35 # Entries unchanged in the rest of history 35 # Entries unchanged in the rest of history
36 echo unchanged > unchanged 36 echo unchanged > unchanged
37 mkdir unchangeddir 37 mkdir unchangeddir
38 echo unchanged2 > unchangeddir/f 38 echo unchanged2 > unchangeddir/f
39 svn add a b da deletedfile deleteddir changed changeddir unchanged unchangeddir 39 # One of the files will be changed afterwards, to test
40 # group copies detection
41 mkdir groupdir
42 echo a > groupdir/a
43 echo b > groupdir/b
44 svn add a b da deletedfile deleteddir changed changeddir unchanged unchangeddir groupdir
40 svn ci -m "add a and b" 45 svn ci -m "add a and b"
41 # Remove files to be copied later 46 # Remove files to be copied later
42 svn rm deletedfile 47 svn rm deletedfile
43 svn rm deleteddir 48 svn rm deleteddir
44 # Update files to be copied before this change 49 # Update files to be copied before this change
45 echo changed >> changed 50 echo changed >> changed
46 echo changed2 >> changeddir/f 51 echo changed2 >> changeddir/f
52 # Update one of the groupdir files
53 echo a >> groupdir/a
47 svn ci -m "delete files and dirs" 54 svn ci -m "delete files and dirs"
48 cd ../branches 55 cd ../branches
49 svn cp ../trunk branch1 56 svn cp ../trunk branch1
50 svn ci -m "create branch1" 57 svn ci -m "create branch1"
51 cd branch1 58 cd branch1
85 # between the source and parent revision, we record them as copy from parent 92 # between the source and parent revision, we record them as copy from parent
86 # instead of source rev. 93 # instead of source rev.
87 svn cp $svnurl/trunk/unchanged@2 unchanged2 94 svn cp $svnurl/trunk/unchanged@2 unchanged2
88 svn cp $svnurl/trunk/unchangeddir@2 unchangeddir2 95 svn cp $svnurl/trunk/unchangeddir@2 unchangeddir2
89 svn ci -m "copy unchanged stuff from the past" 96 svn ci -m "copy unchanged stuff from the past"
97 # Copy groupdir, unfortunately one file was changed after r2 so the
98 # copy should not be recorded at all
99 svn cp $svnurl/trunk/groupdir@2 groupdir2
100 svn ci -m "copy groupdir from the past"
90 cd ../.. 101 cd ../..
91 102
92 svnadmin dump testrepo > ../renames.svndump 103 svnadmin dump testrepo > ../renames.svndump