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