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

Holger Freyther schreef:
| On Tuesday 11 March 2008 11:38:07 Koen Kooi wrote:
|> Graeme Gregory schreef:
|
|
|> * track .dev: mtn propagate org.openembedded.dev org.openmoko.needmorebru
|
| Non content conflict. ugh! What to do now?

Since the delta between the two branches is not more than a few
days/revisions it's easy to find out what happened and move conflict out
of the way in your branch, finish the merge and if needed reapply a diff
needed.

| And this has happened with the dreambox branch and this is why I can't
| encourage anyone to use branches with monotone. Even if there is some
kind of
| management issue with whatever branch, the tool should not punish this
by not
| being able to manage, it is a tool and it should do what it is meant
ot be:
| Allow distributed development, and not being able to merge is
defeating this
| purpose.

The non-content conflict handling is absolutely atrocious in monotone,
and the monotone devs aren't doing anything to make it easier (they
changed the error message to offer some more test) because they never
have such conflicts. Which stinks, because we *do* have them.

With git 1.4 everything is much easier, it just deletes any changes you
made :)

But what I'm trying to get at, and doesn't seem to be getting through,
is that our problems are being caused by people not knowing (and not
wanting to know!) the limitations (quirks/bugs/etc) of the tools they
are using. With monotone we are relatively safe, since short of using
the sqlite3 tool we can't loose data or history when there is a cock-up.
I fear that with other tools that weren't written with data retention in
mind (git) we will lose a big chunk of history every now and then
because someone typed git-quxl instead of git-qux1.

regards,

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

iD8DBQFH1msfMkyGM64RGpERAqWmAJ4yh2rHWEemUYrkaXBnhGYvqHV28QCdHpMx
wbSBUgWj+QNCEIEHudiierY=
=vXv6
-----END PGP SIGNATURE-----