##// END OF EJS Templates
test-largefiles-update: conditionalize output instead of tests
Matt Harbison -
r33344:1e872b08 default
parent child Browse files
Show More
@@ -214,13 +214,11 b' Test that "hg rollback" restores status '
214 $ hg commit -m 'will be rollback-ed soon'
214 $ hg commit -m 'will be rollback-ed soon'
215 $ echo largeY > largeY
215 $ echo largeY > largeY
216 $ hg add --large largeY
216 $ hg add --large largeY
217 #if windows
217
218 $ hg status -A large1
218 $ hg status -A large1
219 large1: * (glob)
219 large1: The system cannot find the file specified (windows !)
220 #else
220 large1: No such file or directory (no-windows !)
221 $ hg status -A large1
221
222 large1: No such file or directory
223 #endif
224 $ hg status -A large2
222 $ hg status -A large2
225 ? large2
223 ? large2
226 $ hg status -A largeX
224 $ hg status -A largeX
@@ -309,39 +307,33 b' automated commit like rebase/transplant'
309 $ hg rebase -s 1 -d 2 --keep
307 $ hg rebase -s 1 -d 2 --keep
310 rebasing 1:72518492caa6 "#1"
308 rebasing 1:72518492caa6 "#1"
311 rebasing 4:07d6153b5c04 "#4" (tip)
309 rebasing 4:07d6153b5c04 "#4" (tip)
312 #if windows
310
313 $ hg status -A large1
311 $ hg status -A large1
314 large1: * (glob)
312 large1: The system cannot find the file specified (windows !)
315 #else
313 large1: No such file or directory (no-windows !)
316 $ hg status -A large1
314
317 large1: No such file or directory
318 #endif
319 $ hg status -A largeX
315 $ hg status -A largeX
320 C largeX
316 C largeX
321 $ hg strip -q 5
317 $ hg strip -q 5
322
318
323 $ hg update -q -C 2
319 $ hg update -q -C 2
324 $ hg transplant -q 1 4
320 $ hg transplant -q 1 4
325 #if windows
321
326 $ hg status -A large1
322 $ hg status -A large1
327 large1: * (glob)
323 large1: The system cannot find the file specified (windows !)
328 #else
324 large1: No such file or directory (no-windows !)
329 $ hg status -A large1
325
330 large1: No such file or directory
331 #endif
332 $ hg status -A largeX
326 $ hg status -A largeX
333 C largeX
327 C largeX
334 $ hg strip -q 5
328 $ hg strip -q 5
335
329
336 $ hg update -q -C 2
330 $ hg update -q -C 2
337 $ hg transplant -q --merge 1 --merge 4
331 $ hg transplant -q --merge 1 --merge 4
338 #if windows
332
339 $ hg status -A large1
333 $ hg status -A large1
340 large1: * (glob)
334 large1: The system cannot find the file specified (windows !)
341 #else
335 large1: No such file or directory (no-windows !)
342 $ hg status -A large1
336
343 large1: No such file or directory
344 #endif
345 $ hg status -A largeX
337 $ hg status -A largeX
346 C largeX
338 C largeX
347 $ hg strip -q 5
339 $ hg strip -q 5
General Comments 0
You need to be logged in to leave comments. Login now