[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 |
Date: |
Fri, 15 Jun 2012 07:51:49 -0400 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/23.2 (windows-nt) |
Hendrik Boom <address@hidden> writes:
> On Thu, Jun 14, 2012 at 08:06:42AM -0400, Stephen Leake wrote:
>> Ethan Blanton <address@hidden> writes:
>>
>> >> An alternate is to live with the 'ignoring upstream changes due to local
>> >> delete' warning in 1.0.
>> >>
>> >> Why is that not ok?
>
> How would monotone know which is upstream and which is downstream?
You left out too much context; when I asked that question, I though the
use case was the 'upstream/downstream' use case, where the answer to
your question is clear.
--
-- Stephe
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict, (continued)
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict, Markus Wanner, 2012/06/08
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict, Stephen Leake, 2012/06/09
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict, Stephen Leake, 2012/06/09
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict, Markus Wanner, 2012/06/11
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict, Stephen Leake, 2012/06/13
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict, Ethan Blanton, 2012/06/12
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict, Stephen Leake, 2012/06/13
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict, Ethan Blanton, 2012/06/13
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict, Stephen Leake, 2012/06/14
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict, Hendrik Boom, 2012/06/14
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict,
Stephen Leake <=
Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict, richhguard-monotone, 2012/06/08