tests/test-largefiles.t
changeset 15630 e6868bd17f24
parent 15603 36d7a0c7505f
parent 15629 5b66e55c0d93
child 15742 65df60a3f96b
equal deleted inserted replaced
15628:2b40513384ca 15630:e6868bd17f24
   645   $ cat sub2/large6
   645   $ cat sub2/large6
   646   large6-modified
   646   large6-modified
   647   $ cat sub2/large7
   647   $ cat sub2/large7
   648   large7
   648   large7
   649 
   649 
       
   650 Test status after merging with a branch that introduces a new largefile:
       
   651 
       
   652   $ echo large > large
       
   653   $ hg add --large large
       
   654   $ hg commit -m 'add largefile'
       
   655   $ hg update -q ".^"
       
   656   $ echo change >> normal3
       
   657   $ hg commit -m 'some change'
       
   658   created new head
       
   659   $ hg merge
       
   660   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
   661   (branch merge, don't forget to commit)
       
   662   getting changed largefiles
       
   663   1 largefiles updated, 0 removed
       
   664   $ hg status
       
   665   M large
       
   666 
   650 Test that a normal file and a largefile with the same name and path cannot
   667 Test that a normal file and a largefile with the same name and path cannot
   651 coexist.
   668 coexist.
   652 
   669 
   653   $ rm sub2/large7
   670   $ rm sub2/large7
   654   $ echo "largeasnormal" > sub2/large7
   671   $ echo "largeasnormal" > sub2/large7