comparison tests/test-rename-merge2.t @ 27131:d837da26155e

merge: add a new action type representing files to add/mark as modified

This is somewhat different from the currently existing 'a' action, for the
following case:

- dirty working copy, with file 'fa' added and 'fm' modified
- hg merge --force with a rev that neither has 'fa' nor 'fm'
- for the change/delete conflicts we pick 'changed' for both 'fa' and 'fm'.

In this case 'branchmerge' is true, but we need to distinguish between 'fa',
which should ultimately be marked added, and 'fm', which should be marked
modified.

Our current strategy is to just not touch the dirstate at all. That works for
now, but won't work once we move change/delete conflicts to the resolve phase.
In that case we may perform repeated re-resolves, some of which might mark the
file removed or remove the file from the dirstate. We'll need to re-add the
file to the dirstate, and we need to be able to figure out whether we mark the
file added or modified. That is what the new 'am' action lets us do.

27130:6f045b563fa5

   ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a
  local changed a which remote deleted
  use (c)hanged version or (d)elete? c
   preserving b for resolve of b
   preserving rev for resolve of rev
   a: prompt keep -> a
   b: both created -> m (premerge)
  picked tool 'python ../merge' for b (binary False symlink False)
  merging b
  my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000
   rev: versions differ -> m (premerge)

27131:d837da26155e

   ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a
  local changed a which remote deleted
  use (c)hanged version or (d)elete? c
   preserving b for resolve of b
   preserving rev for resolve of rev
   a: prompt keep -> am
   b: both created -> m (premerge)
  picked tool 'python ../merge' for b (binary False symlink False)
  merging b
  my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000
   rev: versions differ -> m (premerge)