tests/test-rename-dir-merge.t

23474:9f4ac44a7273

  baz

Remote directory rename with conflicting file added in remote target directory
and committed in local source directory.

BROKEN: the remote is ignored; it should be merged

  $ hg co -qC 2
  $ rm b/c
  $ hg st -A
  ? a/d
  C a/a
  C a/b
  C a/c
  $ hg merge 5
  3 files updated, 0 files merged, 2 files removed, 0 files unresolved
  (branch merge, don't forget to commit)
  $ hg st -A
  M b/a
  M b/b
  A b/c
    a/c
  R a/a
  R a/b
  R a/c
  ? a/d
  $ cat b/c
  baz

Second scenario with two repos:

  $ cd ..
  $ hg init r1

23475:67f1d68861fb

  baz

Remote directory rename with conflicting file added in remote target directory
and committed in local source directory.

  $ hg co -qC 2
  $ rm b/c
  $ hg st -A
  ? a/d
  C a/a
  C a/b
  C a/c
  $ hg merge 5
  merging a/c and b/c to b/c
  warning: conflicts during merge.
  merging b/c incomplete! (edit conflicts, then use 'hg resolve --mark')
  2 files updated, 0 files merged, 2 files removed, 1 files unresolved
  use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
  [1]
  $ hg st -A
  M b/a
  M b/b
  M b/c
    a/c
  R a/a
  R a/b
  R a/c
  ? a/d
  ? b/c.orig
  $ cat b/c
  <<<<<<< local: ce36d17b18fb  - test: 2 add a/c
  baz
  =======
  target
  >>>>>>> other: f1c50ca4f127 - test: new file in target directory

Second scenario with two repos:

  $ cd ..
  $ hg init r1