comparison tests/test-largefiles.t @ 18300:745bc16ccef2

largefiles: fix update from a merge with removed files

A situation with this case could happen after interrupting an update. Update
would fail with:
  abort: No such file or directory: $TESTTMP/f/.hglf/sub2/large6

Update from a merge without using clean is not possible anyway, so this patch
takes a step in the right direction so it gets as far as reporting the right
error.

18299:a7a88a458a4c

  getting changed largefiles
  1 largefiles updated, 0 removed
  $ hg status
  M large

- revert should be able to revert files introduced in a pending merge
  $ hg revert --all -r .
  removing .hglf/large

Test that a normal file and a largefile with the same name and path cannot
coexist.

  $ rm sub2/large7

18300:745bc16ccef2

  getting changed largefiles
  1 largefiles updated, 0 removed
  $ hg status
  M large

- make sure update of merge with removed largefiles fails as expected
  $ hg rm sub2/large6
  $ hg up -r.
  abort: outstanding uncommitted merges
  [255]

- revert should be able to revert files introduced in a pending merge
  $ hg revert --all -r .
  removing .hglf/large
  undeleting .hglf/sub2/large6

Test that a normal file and a largefile with the same name and path cannot
coexist.

  $ rm sub2/large7