[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict
From: |
Stephen Leake |
Subject: |
Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone) |
Date: |
Thu, 21 Jun 2012 06:28:04 -0400 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/23.2 (windows-nt) |
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
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone), (continued)
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone), Markus Wanner, 2012/06/06
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone), Stephen Leake, 2012/06/07
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone), Markus Wanner, 2012/06/08
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone), Stephen Leake, 2012/06/09
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone), Stephen Leake, 2012/06/09
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone), Markus Wanner, 2012/06/11
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone), Stephen Leake, 2012/06/13
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone), Markus Wanner, 2012/06/19
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone), Stephen Leake, 2012/06/19
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone), Markus Wanner, 2012/06/20
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone),
Stephen Leake <=
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone), Hendrik Boom, 2012/06/11
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone), Markus Wanner, 2012/06/12
[Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone), code, 2012/06/19
[Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone), code, 2012/06/21