comparison tests/test-merge-subrepos.t @ 33366:062c1bde1781

test-subrepo: demonstrate a status problem when merge deletes a file

At the interactive update prompt, if (c) is chosen and then followed by `hg rm`,
both `status -R` and `status -S` show the file as 'R', and `files -R` shows no
files (OK, because explicitly removed files aren't supposed to be listed).  If
`rm` follows selecting (c), then both flavors of `status` list the file as '!',
and `files -R` lists the missing file.  So somehow, the (d) option has followed
a third path.

33365:6d88468d435b

  $ hg up -r '.^' --check
  abort: uncommitted changes in subrepository "subrepo"
  [255]

  $ hg up -r '.^' --config ui.interactive=True << EOF
  > c
  > EOF
  other [destination] changed b which local [working copy] deleted
  use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ hg st -S

  $ hg bookmark -r tip @other
  $ echo xyz > subrepo/c
  $ hg ci -SAm 'add c'
  adding subrepo/c

33366:062c1bde1781

  $ hg up -r '.^' --check
  abort: uncommitted changes in subrepository "subrepo"
  [255]

  $ hg up -r '.^' --config ui.interactive=True << EOF
  > d
  > EOF
  other [destination] changed b which local [working copy] deleted
  use (c)hanged version, leave (d)eleted, or leave (u)nresolved? d
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

XXX: There's a difference between wdir() and '.', so there should be a status.
`hg files -S` from the top is also missing 'subrepo/b'.

  $ hg st -S
  $ hg st -R subrepo
  $ hg files -R subrepo
  [1]
  $ hg files -R subrepo -r '.'
  subrepo/b (glob)

  $ hg bookmark -r tip @other
  $ echo xyz > subrepo/c
  $ hg ci -SAm 'add c'
  adding subrepo/c