diff tests/test-issue672.t @ 21082:0d67fccc0d43

merge: let manifestmerge emit 'keep' actions when keeping wd version

Such a 'keep' action will later be the preferred (non)action when there
is multiple ancestors. It is thus very convenient to have it explicitly.

The extra actions will only be emitted in the case where the local file has
changed since the ancestor but the other hasn't. That is the symmetrical
operation to a 'get' action.

This will create more action tuples that not really serve a purpose. The number
of actions will however have the number of changed files as upper bound and it
should thus not increase the memory/cpu use significantly.

--- a/tests/test-issue672.t	Sun Apr 06 13:39:51 2014 +0200
+++ b/tests/test-issue672.t	Mon Apr 07 02:12:28 2014 +0200
@@ -36,6 +36,7 @@
    ancestor: 81f4b099af3d, local: c64f439569a9+, remote: c12dcd37c90a
    1: other deleted -> r
    1a: remote created -> g
+   2: keep -> k
   removing 1
   updating: 1 1/2 files (50.00%)
   getting 1a