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

[Koen Kooi]

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

Markus Schiltknecht schreef:
| Hi,
|
| 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).
|
| Oh.. that makes me wonder how hg and git handle non-content conflicts.

Git has no notion of 'non content', it just sees 'content', not a
node-id, so it doesn't have this problem. AFAIK hg has some other clever
assumptions to deal with this.

| Bears the question of which node id monotone should drop. While you
| might not mind on the first sight, stuff like 'mtn log' or 'mtn
| annotate' will differ significantly.

Right now people do two things:

* don't merge the branch at all and stick some more pins in the mtn
voodoo doll

or

* make a patch (but not with mtn diff[1]!) or do 'cp -a' loosing all
history in the process.

Would a dialog asking the user which node to drop (or rename) be an
acceptible UI?
People with nccs have already been stabbed in the eye, so the thresshold
for "the right thing" has been lowered considerably already.

regards,

Koen

[1] another big problem: mtn has no way of applying the output of 'mtn
diff', rendering 'mtn mv' useless
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFH2U1nMkyGM64RGpERAq7HAJ0a1U8EVjqjidRBhH2/988q9mTO6wCfc+Kv
lt530PpMfl3w5Lo6tvBOwNM=
=xe3A
-----END PGP SIGNATURE-----