Mercurial > hg

comparison tests/test-convert-mtn @ 8124:d883bfbd2e60

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert/mtn: handle directory move into moved directory (issue1619/3)
author Patrick Mezard <pmezard@gmail.com>
date Wed, 22 Apr 2009 10:25:05 +0200
parents 933b874e402f
children 5b7da468531b
comparison
equal deleted inserted replaced
8123:933b874e402f 8124:d883bfbd2e60
86 mtn add dir3/a dir3/d1 86 mtn add dir3/a dir3/d1
87 mtn ci -m dirfilemove 87 mtn ci -m dirfilemove
88 mtn mv dir3/a dir3/d1/a 88 mtn mv dir3/a dir3/d1/a
89 mtn mv dir3/d1 dir3/d2 89 mtn mv dir3/d1 dir3/d2
90 mtn ci -m dirfilemove2 90 mtn ci -m dirfilemove2
91 echo '% test directory move into another directory move'
92 mkdir dir4
93 mkdir dir5
94 echo a > dir4/a
95 mtn add dir4/a dir5
96 mtn ci -m dirdirmove
97 mtn mv dir5 dir6
98 mtn mv dir4 dir6/dir4
99 mtn ci -m dirdirmove2
100 echo '% test diverging directory moves'
101 mkdir -p dir7/dir9/dir8
102 echo a > dir7/dir9/dir8/a
103 echo b > dir7/dir9/b
104 echo c > dir7/c
105 mtn add -R dir7
106 mtn ci -m divergentdirmove
107 mtn mv dir7 dir7-2
108 mtn mv dir7-2/dir9 dir9-2
109 mtn mv dir9-2/dir8 dir8-2
110 mtn ci -m divergentdirmove2
91 cd .. 111 cd ..
92 112
93 echo % convert incrementally 113 echo % convert incrementally
94 hg convert -s mtn repo.mtn 114 hg convert -s mtn repo.mtn
95 115
116 hg log -v -C -r 4 | grep copies 136 hg log -v -C -r 4 | grep copies
117 echo % check file remove with directory move 137 echo % check file remove with directory move
118 hg manifest -r 5 138 hg manifest -r 5
119 echo % check file move with directory move 139 echo % check file move with directory move
120 hg manifest -r 9 140 hg manifest -r 9
141 echo % check file directory directory move
142 hg manifest -r 11
143 echo % check divergent directory moves
144 hg manifest -r 13
121 exit 0 145 exit 0
122 146