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

     2

     3

  $ mkdir alpha

     4

  $ touch alpha/one

     5

  $ mkdir beta

     6

  $ touch beta/two

     7

     8

  $ hg add alpha/one beta/two

     9

  $ hg ci -m "start"

    10

    11

  $ echo 1 > alpha/one

    12

  $ echo 2 > beta/two

    13

    14

everything

    15

    16

  $ hg diff --nodates

    17

  diff -r 7d5ef1aea329 alpha/one

    18

  --- a/alpha/one

    19

  +++ b/alpha/one

    20

  @@ -0,0 +1,1 @@

    21

  +1

    22

  diff -r 7d5ef1aea329 beta/two

    23

  --- a/beta/two

    24

  +++ b/beta/two

    25

  @@ -0,0 +1,1 @@

    26

  +2

    27

    28

beta only

    29

    30

  $ hg diff --nodates beta

    31

  diff -r 7d5ef1aea329 beta/two

    32

  --- a/beta/two

    33

  +++ b/beta/two

    34

  @@ -0,0 +1,1 @@

    35

  +2

    36

    37

inside beta

    38

    39

  $ cd beta

    40

  $ hg diff --nodates .

    41

  diff -r 7d5ef1aea329 beta/two

    42

  --- a/beta/two

    43

  +++ b/beta/two

    44

  @@ -0,0 +1,1 @@

    45

  +2

    46

    47

relative to beta

    48

    49

  $ cd ..

    50

  $ hg diff --nodates --root beta

    51

  diff -r 7d5ef1aea329 two

    52

  --- a/two

    53

  +++ b/two

    54

  @@ -0,0 +1,1 @@

    55

  +2

    56

    57

inside beta

    58

    59

  $ cd beta

    60

  $ hg diff --nodates --root .

    61

  diff -r 7d5ef1aea329 two

    62

  --- a/two

    63

  +++ b/two

    64

  @@ -0,0 +1,1 @@

    65

  +2

    66

    67

  $ cd ..