[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: |
Zack Weinberg |
Subject: |
Re: [Monotone-devel] Re: non-content conflicts AKA Openembedded is dumping monotone because it can merge anything |
Date: |
Sat, 22 Mar 2008 00:42:27 -0400 |
On Fri, Mar 21, 2008 at 4:14 PM, Christof Petig <address@hidden> wrote:
> Zack Weinberg schrieb:
> > 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.
>
> 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)
Ok. I won't be able to attend in person but I will try to be around
on IRC at that time and will certainly be reading and responding to
stuff on the mailing list.
zw
- [Monotone-devel] non-content conflicts AKA Openembedded is dumping monotone because it can merge anything, Koen Kooi, 2008/03/13
- Re: [Monotone-devel] non-content conflicts AKA Openembedded is dumping monotone because it can merge anything, Markus Schiltknecht, 2008/03/13
- [Monotone-devel] Re: non-content conflicts AKA Openembedded is dumping monotone because it can merge anything, Bruce Stephens, 2008/03/13
- [Monotone-devel] Re: non-content conflicts AKA Openembedded is dumping monotone because it can merge anything, Koen Kooi, 2008/03/13
- Re: [Monotone-devel] Re: non-content conflicts AKA Openembedded is dumping monotone because it can merge anything, Zack Weinberg, 2008/03/13
- [Monotone-devel] Re: non-content conflicts AKA Openembedded is dumping monotone because it can merge anything, Koen Kooi, 2008/03/13
- [Monotone-devel] Re: non-content conflicts AKA Openembedded is dumping monotone because it can merge anything, Koen Kooi, 2008/03/13
- Re: [Monotone-devel] Re: non-content conflicts AKA Openembedded is dumping monotone because it can merge anything, Christof Petig, 2008/03/21
- Re: [Monotone-devel] Re: non-content conflicts AKA Openembedded is dumping monotone because it can merge anything,
Zack Weinberg <=
- [Monotone-devel] Re: non-content conflicts AKA Openembedded is dumping monotone because it can merge anything, Koen Kooi, 2008/03/24