Mercurial > hg

comparison tests/test-convert-svn-branches @ 6540:55bd855fc0af

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert: improve subversion branch filtering
author Patrick Mezard <pmezard@gmail.com>
date Mon, 14 Apr 2008 22:31:33 +0200
parents b6a24c273c30
children 6ec941b6003d
comparison
equal deleted inserted replaced
6539:7814d7bb77bc 6540:55bd855fc0af
64 64
65 echo % update old branch again 65 echo % update old branch again
66 "$TESTDIR/svn-safe-append.py" b branches/old/b 66 "$TESTDIR/svn-safe-append.py" b branches/old/b
67 svn ci -m "change b again" 67 svn ci -m "change b again"
68 68
69 echo % move back and forth between branch of similar names
70 # This used to generate fake copy records
71 svn up
72 svn move branches/old branches/old2
73 svn ci -m "move to old2"
74 svn move branches/old2 branches/old
75 svn ci -m "move back to old"
76
69 echo % update trunk again 77 echo % update trunk again
70 "$TESTDIR/svn-safe-append.py" a trunk/a 78 "$TESTDIR/svn-safe-append.py" a trunk/a
71 svn ci -m "last change to a" 79 svn ci -m "last change to a"
72 cd .. 80 cd ..
73 81
74 echo % convert trunk and branches 82 echo % convert trunk and branches
75 hg convert --datesort $svnurl A-hg 83 hg convert --datesort $svnurl A-hg
76 84
77 echo % branch again from a converted revision 85 echo % branch again from a converted revision
78 cd A 86 cd A
79 svn copy -r 1 $svnurl/trunk branches/old2 87 svn copy -r 1 $svnurl/trunk branches/old3
80 svn ci -m "branch trunk@1 into old2" 88 svn ci -m "branch trunk@1 into old3"
81 cd .. 89 cd ..
82 90
83 echo % convert again 91 echo % convert again
84 hg convert --datesort $svnurl A-hg 92 hg convert --datesort $svnurl A-hg
85 93
86 cd A-hg 94 cd A-hg
87 hg glog --template '#rev# #desc|firstline# files: #files#\n' 95 hg glog --template 'branch=#branches# #rev# #desc|firstline# files: #files#\n'
88 hg branches | sed 's/:.*/:/' 96 hg branches | sed 's/:.*/:/'
89 hg tags -q 97 hg tags -q
90 cd .. 98 cd ..