[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Monotone-devel] Re: non-content conflicts AKA Openembedded is dumpi

From: Christof Petig
Subject: Re: [Monotone-devel] Re: non-content conflicts AKA Openembedded is dumping monotone because it can merge anything
Date: Fri, 21 Mar 2008 21:14:20 +0100
User-agent: Thunderbird (X11/20080227)

Hash: SHA1

Zack Weinberg schrieb:
> On Thu, Mar 13, 2008 at 11:51 AM, Koen Kooi
> <address@hidden> wrote:
>>  Markus Schiltknecht schreef:
>>  | Koen Kooi wrote:
>>  |> As the subject already hints at, OpenEmbedded is seriously looking at hg
>>  |> and git because mtn can't merge any of our branches due to non-content
>>  |> conflicts (ncc).
> I feel somewhat responsible for having abandoned work on workspace
> merge, um, almost two years ago now; that would have addressed most of
> your problems.
> Dealing with nccs *is* just a simple matter of programming, and for
> your case (willing to put up with merge-right-now, only care about
> add/add conflict) I think there could be a hackish solution where we
> throw those into the content_merge lua hook too.
> Are you willing to attempt to code it?  If so, I can commit to
> reviewing and/or offering implementation advice.  (I do not have time
> to do it myself.  Also I may be offline all of next week.)

Let's plan this for the Wuppertal hackathlon. I feel that a solution for
this and a tortoise port is more important to monotone than partial pull
(which I have been neglecting during the past 12 months)

Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla -


reply via email to

[Prev in Thread] Current Thread [Next in Thread]