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

#require bzr

     2

     3

  $ . "$TESTDIR/bzr-definitions"

     4

  $ cat > treeset.py <<EOF

     5

  > import sys

     6

  > from bzrlib import workingtree

     7

  > wt = workingtree.WorkingTree.open('.')

     8

  > 

     9

  > message, rootid = sys.argv[1:]

    10

  > wt.set_root_id('tree_root-%s' % rootid)

    11

  > wt.commit(message)

    12

  > EOF

    13

    14

change the id of the tree root

    15

    16

  $ mkdir test-change-treeroot-id

    17

  $ cd test-change-treeroot-id

    18

  $ bzr init -q source

    19

  $ cd source

    20

  $ echo content > file

    21

  $ bzr add -q file

    22

  $ bzr commit -q -m 'Initial add'

    23

  $ python ../../treeset.py 'Changed root' new

    24

  $ cd ..

    25

  $ hg convert source source-hg

    26

  initializing destination source-hg repository

    27

  scanning source...

    28

  sorting...

    29

  converting...

    30

  1 Initial add

    31

  0 Changed root

    32

  $ manifest source-hg tip

    33

  % manifest of tip

    34

  644   file

    35

    36

  $ cd ..