[Monotone-devel] changing behavior of --message and --message-file for propagate

[Stephen Leake]

As part of implementing the resolve_conflicts commands, I'd like to
change the behavior of --message and --message-file for propagate and
merge.

I'd like mtn to insert the current message: 

propagate from branch 'testbranch2' (head 
c606ed519e48f526bb130fd64fef712f795f0625)
            to branch 'testbranch1' (head 
04fe9ed6642b2e258162f948934726a3085e473f)

and then append the user-specified message. This allows a file-by-file
description of changes for files modified by the conflict resolution
process, similar to what we normally do for regular commits.

However, this breaks the schema_migration_with_rosterify test,
although not seriously. Part of that test compares the certs in two
databases. One of the certs is the changelog for a propagate. Normally
the two certs would be different because of different revids, but the
test uses --message-file to specify one of the changelog certs to be
the same as the other.

My change above makes the certs no longer the same.

One way to fix the schema_migration_with_rosterify test is to add code
to ignore the changelog certs, but that's not simple to do; the
current test just compares the entire output of 'automate certs', it
doesn't parse it.

Another fix is to not check the certs, but I suspect that's not a good
idea.

Another fix is to revert my change, and require the user to insert the
"propagate from" message as part of their changelog. I don't think
that's friendly. But since I'll normally be using Emacs DVC to do
this, I could have DVC insert the "propagate from" part.

-- 
-- Stephe