Re: Reconsidering the work flow and how the SCM system fits in

[Koen Kooi <koen@dominion.kabel.utwente.nl>]

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

Richard Purdie schreef:

| You basically said that if you hadn't run "mtn propagate" every X days
| you would have had an unmergable mess?

I didn't say that, because that isn't true

| The dreambox branch is unmergable because this hasn't been done?

Actually the dreambox branch *is* mergable once you fix up the
non-content conflicts[1].

How do you get a non-content conflict: a file gets added on both
branches seperately, so on each branch it gets a different node-id.
Solution: 'mtn mv' or 'mtn drop' the file.

What has happened in the dreambox branch: updates weren't done with
propagate, but by copying over files and 'mtn add -R ; mtn commit'-ing them.

The problem is that mtn developers fail to accept that silently merging
node-ids is OK when the *contents* are the same.

regards,

Koen

[1] there are a lot of them
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFH2OtyMkyGM64RGpERAmKFAJwLaMVc8G9bJuiYu2R39e7uIsOCEgCgsS+N
4wJwVmPa50Rj5cDiTuebTV4=
=2ccG
-----END PGP SIGNATURE-----