tests/test-largefiles-misc.t
changeset 24787 9d5c27890790
parent 24680 0974d3a0be29
child 24813 2553ef7355ab
equal deleted inserted replaced
24786:56e15db9109f 24787:9d5c27890790
   362   M subrepo/large.txt
   362   M subrepo/large.txt
   363 # update -C should revert the change.
   363 # update -C should revert the change.
   364   $ hg update -C
   364   $ hg update -C
   365   getting changed largefiles
   365   getting changed largefiles
   366   1 largefiles updated, 0 removed
   366   1 largefiles updated, 0 removed
   367   getting changed largefiles
       
   368   0 largefiles updated, 0 removed
       
   369   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   367   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   370   $ hg status -S
   368   $ hg status -S
   371 
   369 
   372   $ hg forget -v subrepo/large.txt
   370   $ hg forget -v subrepo/large.txt
   373   removing subrepo/large.txt (glob)
   371   removing subrepo/large.txt (glob)
   803   Invoking status precommit hook
   801   Invoking status precommit hook
   804   A d2/f
   802   A d2/f
   805   R d1/f
   803   R d1/f
   806   $ hg merge
   804   $ hg merge
   807   merging d2/f and d1/f to d2/f
   805   merging d2/f and d1/f to d2/f
   808   getting changed largefiles
       
   809   0 largefiles updated, 0 removed
       
   810   1 files updated, 1 files merged, 0 files removed, 0 files unresolved
   806   1 files updated, 1 files merged, 0 files removed, 0 files unresolved
   811   (branch merge, don't forget to commit)
   807   (branch merge, don't forget to commit)
   812   $ cd ..
   808   $ cd ..
   813 
   809 
   814 
   810