simplemerge: move conflict warning message to filemerge The current output for a failed merge with conflict markers looks something like: merging foo warning: conflicts during merge. merging foo incomplete! (edit conflicts, then use 'hg resolve --mark') merging bar warning: conflicts during merge. merging bar incomplete! (edit conflicts, then use 'hg resolve --mark') We're going to change the way merges are done to perform all premerges before all merges, so that the output above would look like: merging foo merging bar warning: conflicts during merge. merging foo incomplete! (edit conflicts, then use 'hg resolve --mark') warning: conflicts during merge. merging bar incomplete! (edit conflicts, then use 'hg resolve --mark') The 'warning: conflicts during merge' line has no context, so is pretty confusing. This patch will change the future output to: merging foo merging bar warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') warning: conflicts while merging bar! (edit, then use 'hg resolve --mark') The hint on how to resolve the conflicts makes this a bit unwieldy, but solving that is tricky because we already hint that people run 'hg resolve' to retry unresolved merges. The 'hg resolve --mark' mostly applies to conflict marker based resolution.

     1

Test update logic when there are renames

     2

     3

Update with local changes across a file rename

     4

     5

  $ hg init

     6

     7

  $ echo a > a

     8

  $ hg add a

     9

  $ hg ci -m a

    10

    11

  $ hg mv a b

    12

  $ hg ci -m rename

    13

    14

  $ echo b > b

    15

  $ hg ci -m change

    16

    17

  $ hg up -q 0

    18

    19

  $ echo c > a

    20

    21

  $ hg up

    22

  merging a and b to b

    23

  warning: conflicts while merging b! (edit, then use 'hg resolve --mark')

    24

  0 files updated, 0 files merged, 0 files removed, 1 files unresolved

    25

  use 'hg resolve' to retry unresolved file merges

    26

  [1]