Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone)

[Stephen Leake]

Markus Wanner <address@hidden> writes:

> On 06/19/2012 01:56 PM, Stephen Leake wrote:
>> Ok, that makes sense. I did wonder whether to include something like
>> "history will be lost; see user guide" in the conflict resolution
>> message.
>
> That already covers the major point, I think. Maybe a bit more specific
> (monotone certainly shouldn't ever lose the entire history):
>
> "History for file ${FOO} will be lost; see the users manual, section ${BAR}"
>
> (Nit-pick: it's usually called a manual, not a guide, is it?)

Ok. Currently nvm.issue-209 has:

check(mtn("explicit_merge", "--resolve-conflicts", left_1, right_1, 
"testbranch"), 0, nil, true)
check(samelines
("stderr",
 {"mtn: [left]  506d8ed51b06c0080e8bb307155a88637045b532",
  "mtn: [right] a2889488ed1801a904d0219ec9939dfc2e9be033",
  "mtn: keeping 'file_2'",
  "mtn: [merged] 3df3126220588440def7b08f488ca35eaa94f1b6"}))

I'll change that to:

check(mtn("explicit_merge", "--resolve-conflicts", left_1, right_1, 
"testbranch"), 0, nil, true)
check(samelines
("stderr",
 {"mtn: [left]  506d8ed51b06c0080e8bb307155a88637045b532",
  "mtn: [right] a2889488ed1801a904d0219ec9939dfc2e9be033",
  "mtn: keeping 'file_2'",
  "mtn: history for 'file_2' will be lost; see user manual Merge Conflicts 
section",
  "mtn: [merged] 3df3126220588440def7b08f488ca35eaa94f1b6"}))

-- 
-- Stephe