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

[Koen Kooi]

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

Hi,

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).

Of course you are going to reply with "you have the wrong problem", but
I can't change the fact that people copy over files and commit them in
different branches, or use mtn pluck to get one fix and not the shitload
of bugs from the development branch.

Now the constructive part:

The acceptable solution (for me, can't speak for others due to their
rabid hate for mtn ncc's) would the like this:

1) mtn notes ncc and checks content
~ 1a) same content -> merge + print warning/decision, continue merge
~ 1b) different content -> dialog:

~ - keep file ncc.txt:
~   1) from org.branch.foo with hash 457252837582759824, last edited by
Chuck Frobnor on april fool's day
~   2) from com.company.exploit with hash 48129390950329502, last edited
by Evil Overlord on 20080305
~  - use mergetool to merge them
~   3) meld
~   4) kdiff3

2) ???

3) Profit!

If that was implemented in mtn I wouldn't have to waste days to switch
OE away from mtn because the git-kiddies can't handle nccs.

Koen

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFH2S5FMkyGM64RGpERAvv9AKC6MFAASZjdL5u6wPXAf21djpFmKQCgrWZG
pjxh6Bssxr1n0GHSSF9L2Xw=
=lftY
-----END PGP SIGNATURE-----