##// END OF EJS Templates
test-convert-svn-sink: properly isolate symlink section...
Matt Mackall -
r23098:675e4155 stable
parent child Browse files
Show More
@@ -224,15 +224,21 b' Symlinks'
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
@@ -245,6 +251,13 b' Symlinks'
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
@@ -260,17 +273,16 b' Convert with --full adds and removes fil'
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
General Comments 0
You need to be logged in to leave comments. Login now