[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: |
Markus Wanner |
Subject: |
Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone) |
Date: |
Tue, 19 Jun 2012 09:26:37 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:10.0.4) Gecko/20120510 Icedove/10.0.4 |
On 06/19/2012 08:47 AM, address@hidden wrote:
> Comments (last first):
>
> # By Stephen Leake, Jun 19, 2012:
>
> One way to support that use case, and similar ones, is to provide a
> 'mtn:resolve_conflict' attribute, to specify the 'drop' resolution for this
> case. Work on this is being done in branch nvm.issue-209.file_attribute.
Cool, thanks.
Markus Wanner
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone), (continued)
- 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, 2012/06/21
- 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
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone),
Markus Wanner <=
[Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone), code, 2012/06/21