merge: move almost all change/delete conflicts to resolve phase (BC) (API) We have finally laid all the groundwork to make this happen. The only change/delete conflicts that haven't been moved are .hgsubstate conflicts. Those are trickier to deal with and well outside the scope of this series. We add comprehensive testing not just for the initial selections but also for re-resolves and all possible dirstate transitions caused by merge tools. That testing managed to shake out several bugs in the way we were handling dirstate transitions. The other test changes are because we now treat change/delete conflicts as proper merges, and increment the 'merged' counter rather than the 'updated' counter. I believe this is the right approach here. For third-party extensions, if they're interacting with filemerge code they might have to deal with an absentfilectx rather than a regular filectx. Still to come: - add a 'leave unresolved' option to merges - change the default for non-interactive change/delete conflicts to be 'leave unresolved' - add debug output to go alongside debug outputs for binary and symlink file merges

     1

  $ hg init t

     2

  $ cd t

     3

  $ echo This is file a1 > a

     4

  $ hg add a

     5

  $ hg commit -m "commit #0"

     6

  $ echo This is file b1 > b

     7

  $ hg add b

     8

  $ hg commit -m "commit #1"

     9

  $ rm b

    10

  $ hg update 0

    11

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

    12

  $ echo This is file b2 > b

    13

  $ hg add b

    14

  $ hg commit -m "commit #2"

    15

  created new head

    16

  $ cd ..; rm -r t

    17

    18

  $ mkdir t

    19

  $ cd t

    20

  $ hg init

    21

  $ echo This is file a1 > a

    22

  $ hg add a

    23

  $ hg commit -m "commit #0"

    24

  $ echo This is file b1 > b

    25

  $ hg add b

    26

  $ hg commit -m "commit #1"

    27

  $ rm b

    28

  $ hg update 0

    29

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

    30

  $ echo This is file b2 > b

    31

  $ hg commit -A -m "commit #2"

    32

  adding b

    33

  created new head

    34

  $ cd ..; rm -r t

    35

    36

  $ hg init t

    37

  $ cd t

    38

  $ echo This is file a1 > a

    39

  $ hg add a

    40

  $ hg commit -m "commit #0"

    41

  $ echo This is file b1 > b

    42

  $ hg add b

    43

  $ hg commit -m "commit #1"

    44

  $ rm b

    45

  $ hg remove b

    46

  $ hg update 0

    47

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

    48

  $ echo This is file b2 > b

    49

  $ hg commit -A -m "commit #2"

    50

  adding b

    51

  created new head

    52

    53

  $ cd ..