view tests/test-nested-repo.t @ 12664:545ec1775021

merge: handle no file parent in backwards merge (issue2364)

  $ hg init a
  $ cd a
  $ hg init b
  $ echo x > b/x

Should print nothing:

  $ hg add b
  $ hg st

Should fail:

  $ hg st b/x
  abort: path 'b/x' is inside repo 'b'
  [255]
  $ hg add b/x
  abort: path 'b/x' is inside repo 'b'
  [255]

Should fail:

  $ hg add b b/x
  abort: path 'b/x' is inside repo 'b'
  [255]
  $ hg st

Should arguably print nothing:

  $ hg st b

  $ echo a > a
  $ hg ci -Ama a

Should fail:

  $ hg mv a b
  abort: path 'b/a' is inside repo 'b'
  [255]
  $ hg st