equal
deleted
inserted
replaced
29 prevents unnecessary hashing of content - also after linear/noop update |
29 prevents unnecessary hashing of content - also after linear/noop update |
30 |
30 |
31 $ sleep 1 |
31 $ sleep 1 |
32 $ hg st |
32 $ hg st |
33 $ hg debugdirstate --large --nodate |
33 $ hg debugdirstate --large --nodate |
34 n 644 7 large1 |
34 n 644 7 set large1 |
35 n 644 13 large2 |
35 n 644 13 set large2 |
36 $ hg up |
36 $ hg up |
37 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
37 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
38 $ hg debugdirstate --large --nodate |
38 $ hg debugdirstate --large --nodate |
39 n 644 7 large1 |
39 n 644 7 set large1 |
40 n 644 13 large2 |
40 n 644 13 set large2 |
41 |
41 |
42 Test that "hg merge" updates largefiles from "other" correctly |
42 Test that "hg merge" updates largefiles from "other" correctly |
43 |
43 |
44 (getting largefiles from "other" normally) |
44 (getting largefiles from "other" normally) |
45 |
45 |
335 $ echo 'modified large2 for linear merge' > large2 |
335 $ echo 'modified large2 for linear merge' > large2 |
336 $ hg update -q 5 |
336 $ hg update -q 5 |
337 remote turned local largefile large2 into a normal file |
337 remote turned local largefile large2 into a normal file |
338 keep (l)argefile or use (n)ormal file? l |
338 keep (l)argefile or use (n)ormal file? l |
339 $ hg debugdirstate --nodates | grep large2 |
339 $ hg debugdirstate --nodates | grep large2 |
340 a 0 -1 .hglf/large2 |
340 a 0 -1 unset .hglf/large2 |
341 r 0 0 large2 |
341 r 0 0 set large2 |
342 $ hg status -A large2 |
342 $ hg status -A large2 |
343 A large2 |
343 A large2 |
344 $ cat large2 |
344 $ cat large2 |
345 modified large2 for linear merge |
345 modified large2 for linear merge |
346 |
346 |
351 $ hg add --large large3 |
351 $ hg add --large large3 |
352 $ hg update -q 5 |
352 $ hg update -q 5 |
353 remote turned local largefile large3 into a normal file |
353 remote turned local largefile large3 into a normal file |
354 keep (l)argefile or use (n)ormal file? l |
354 keep (l)argefile or use (n)ormal file? l |
355 $ hg debugdirstate --nodates | grep large3 |
355 $ hg debugdirstate --nodates | grep large3 |
356 a 0 -1 .hglf/large3 |
356 a 0 -1 unset .hglf/large3 |
357 r 0 0 large3 |
357 r 0 0 set large3 |
358 $ hg status -A large3 |
358 $ hg status -A large3 |
359 A large3 |
359 A large3 |
360 $ cat large3 |
360 $ cat large3 |
361 large3 as large file for linear merge |
361 large3 as large file for linear merge |
362 $ rm -f large3 .hglf/large3 |
362 $ rm -f large3 .hglf/large3 |