-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Zack Weinberg schrieb: > On Thu, Mar 13, 2008 at 11:51 AM, Koen Kooi > <[EMAIL PROTECTED]> 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) Christof -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFH5Bccng+R+0ucfO0RAuSIAJkBtTRL2AXW3HybjmI05piuGJu3qQCfaKrM uD262GYS4mNy2hydTemDPm4= =Uzhh -----END PGP SIGNATURE----- _______________________________________________ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
