tests/test-largefiles.t
changeset 46418 dc00324e80f4
parent 45906 95c4cca641f6
child 49777 e1953a34c110
equal deleted inserted replaced
46417:768056549737 46418:dc00324e80f4
  1749 
  1749 
  1750 - make sure update of merge with removed largefiles fails as expected
  1750 - make sure update of merge with removed largefiles fails as expected
  1751   $ hg rm sub2/large6
  1751   $ hg rm sub2/large6
  1752   $ hg up -r.
  1752   $ hg up -r.
  1753   abort: outstanding uncommitted merge
  1753   abort: outstanding uncommitted merge
  1754   [255]
  1754   [20]
  1755 
  1755 
  1756 - revert should be able to revert files introduced in a pending merge
  1756 - revert should be able to revert files introduced in a pending merge
  1757   $ hg revert --all -r .
  1757   $ hg revert --all -r .
  1758   removing .hglf/large
  1758   removing .hglf/large
  1759   undeleting .hglf/sub2/large6
  1759   undeleting .hglf/sub2/large6