From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [80.91.229.2] (helo=ciao.gmane.org) by linuxtogo.org with esmtp (Exim 4.69) (envelope-from ) id 1JZ2Zf-0004tT-Ic for openembedded-devel@openembedded.org; Tue, 11 Mar 2008 12:23:21 +0100 Received: from list by ciao.gmane.org with local (Exim 4.43) id 1JZ2Xh-00017Z-6S for openembedded-devel@openembedded.org; Tue, 11 Mar 2008 11:21:14 +0000 Received: from s55917625.adsl.wanadoo.nl ([85.145.118.37]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 11 Mar 2008 11:21:13 +0000 Received: from koen by s55917625.adsl.wanadoo.nl with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 11 Mar 2008 11:21:13 +0000 X-Injected-Via-Gmane: http://gmane.org/ To: openembedded-devel@openembedded.org From: Koen Kooi Date: Tue, 11 Mar 2008 12:21:03 +0100 Message-ID: References: <200803110807.11368.zecke@selfish.org> <20080311101433.77a09fd2@cimmeria> <200803111156.55481.zecke@selfish.org> Mime-Version: 1.0 X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: s55917625.adsl.wanadoo.nl User-Agent: Thunderbird 2.0.0.12 (Macintosh/20080213) In-Reply-To: <200803111156.55481.zecke@selfish.org> X-Enigmail-Version: 0.95.6 Sender: news X-SA-Exim-Connect-IP: 80.91.229.2 X-SA-Exim-Mail-From: gcho-openembedded-devel@m.gmane.org X-Spam-Checker-Version: SpamAssassin 3.2.3 (2007-08-08) on serenity X-Spam-Level: X-Spam-Status: No, score=0.1 required=5.0 tests=AWL,RDNS_NONE autolearn=no version=3.2.3 X-SA-Exim-Version: 4.2.1 (built Tue, 21 Aug 2007 23:39:36 +0000) X-SA-Exim-Scanned: Yes (on linuxtogo.org) Subject: Re: Reconsidering the work flow and how the SCM system fits in X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.9 Precedence: list Reply-To: openembedded-devel@lists.openembedded.org List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Mar 2008 11:23:22 -0000 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit -----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-----