comparison tests/test-convert-svn-sink.t @ 23098:675e415568af stable

test-convert-svn-sink: properly isolate symlink section This was fixed earlier by moving all the symlink bits to a section to the end of the file, but then it was broken (by the same person) by adding more tests at the end.
author Matt Mackall <mpm@selenic.com>
date Mon, 27 Oct 2014 18:44:05 -0500
parents 35ab037de989
children 6df4bc39f682
comparison
equal deleted inserted replaced
23097:30124c40d11f 23098:675e415568af
222 $ ln -s a/missing a/link 222 $ ln -s a/missing a/link
223 $ hg --cwd a commit -Am 'add symlink' 223 $ hg --cwd a commit -Am 'add symlink'
224 adding link 224 adding link
225 $ hg --cwd a mv link newlink 225 $ hg --cwd a mv link newlink
226 $ hg --cwd a commit -m 'move symlink' 226 $ hg --cwd a commit -m 'move symlink'
227 $ hg convert -d svn a 227 $ hg convert -d svn a a-svnlink
228 assuming destination a-hg 228 initializing svn repository 'a-svnlink'
229 initializing svn working copy 'a-hg-wc' 229 initializing svn working copy 'a-svnlink-wc'
230 scanning source... 230 scanning source...
231 sorting... 231 sorting...
232 converting... 232 converting...
233 7 add a file
234 6 modify a file
235 5 rename a file
236 4 copy a file
237 3 remove a file
238 2 make a file executable
233 1 add symlink 239 1 add symlink
234 0 move symlink 240 0 move symlink
235 $ svnupanddisplay a-hg-wc 1 241 $ svnupanddisplay a-svnlink-wc 1
236 8 1 test d1 242 8 1 test d1
237 8 1 test d1/d2 243 8 1 test d1/d2
238 8 1 test d1/d2/b 244 8 1 test d1/d2/b
239 8 6 test c 245 8 6 test c
240 8 8 test . 246 8 8 test .
243 author: test 249 author: test
244 msg: move symlink 250 msg: move symlink
245 D /link 251 D /link
246 A /newlink (from /link@7) 252 A /newlink (from /link@7)
247 253
254 Make sure our changes don't affect the rest of the test cases
255
256 $ hg --cwd a up 5
257 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
258 $ hg --cwd a --config extensions.strip= strip -r 6
259 saved backup bundle to $TESTTMP/a/.hg/strip-backup/bd4f7b7a7067-backup.hg
260
248 #endif 261 #endif
249 262
250 Convert with --full adds and removes files that didn't change 263 Convert with --full adds and removes files that didn't change
251 264
252 $ touch a/f 265 $ touch a/f
258 scanning source... 271 scanning source...
259 sorting... 272 sorting...
260 converting... 273 converting...
261 0 f 274 0 f
262 $ svnupanddisplay a-hg-wc 1 275 $ svnupanddisplay a-hg-wc 1
263 9 9 test . 276 7 7 test .
264 9 9 test d 277 7 7 test d
265 9 9 test f 278 7 7 test f
266 revision: 9 279 revision: 7
267 author: test 280 author: test
268 msg: f 281 msg: f
269 D /c 282 D /c
270 A /d 283 A /d
271 D /d1 284 D /d1
272 A /f 285 A /f
273 D /newlink
274 286
275 $ rm -rf a a-hg a-hg-wc 287 $ rm -rf a a-hg a-hg-wc
276 288
277 289
278 Executable in new directory 290 Executable in new directory