[Monotone-devel] Re: non-content conflicts AKA Openembedded is dumping monotone because it can merge anything

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Christof Petig schreef:
| 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)

The testcase would be to merge org.openembedded.dreambox back into
org.openembedded.dev, both can be pulled from amethyst.openembedded.net
[1], or wget
http://www.openembedded.org/snapshots/OE-this-is-for-mtn-0.37.mtn.bz2

regards,

Koen

[1] I too get confused by openembedded.net and openembedded.org
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFH57TtMkyGM64RGpERAufIAJ9R4ggEwL100NgM8AgkKc+j9YSxPACffrqt
w86KLLnzyOAVG5EU61fRw00=
=Z7Aw
-----END PGP SIGNATURE-----