Received: from spf3.us4.outblaze.com (spf3.us4.outblaze.com [205.158.62.25]) by sdf.lonestar.org (8.12.10/8.12.10) with ESMTP id iALJSQ4h004526 for ; Sun, 21 Nov 2004 19:28:26 GMT Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by spf3.us4.outblaze.com (Postfix) with ESMTP id 1AA4A53EB9 for ; Sun, 21 Nov 2004 19:28:28 +0000 (GMT) Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CVxWt-0004hX-4J for migo@homemail.com; Sun, 21 Nov 2004 14:37:47 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33) id 1CVxWK-0004bI-Ez for gnu-arch-users@gnu.org; Sun, 21 Nov 2004 14:37:12 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33) id 1CVxWJ-0004aq-G1 for gnu-arch-users@gnu.org; Sun, 21 Nov 2004 14:37:11 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CVxWJ-0004an-Dt for gnu-arch-users@gnu.org; Sun, 21 Nov 2004 14:37:11 -0500 Received: from [134.157.0.129] (helo=shiva.jussieu.fr) by monty-python.gnu.org with esmtp (Exim 4.34) id 1CVxMV-0001dF-Rq for gnu-arch-users@gnu.org; Sun, 21 Nov 2004 14:27:04 -0500 Received: from helium.pps.jussieu.fr (helium.pps.jussieu.fr [134.157.168.2]) by shiva.jussieu.fr (8.12.11/jtpda-5.4) with ESMTP id iALJR1N6093273 for ; Sun, 21 Nov 2004 20:27:01 +0100 (CET) X-Ids: 168 Received: from (jch@localhost) by helium.pps.jussieu.fr (8.11.6/jtpda-5.3.2) id iALJR0f71423 ; Sun, 21 Nov 2004 20:27:00 +0100 (CET) To: gnu-arch-users@gnu.org Subject: Re: [Gnu-arch-users] Re: darcs vs tla References: <20041107234609.7bf0abfe@delta.hk.office.outblaze.com> <877jowbl8w.fsf@tleepslib.sk.tsukuba.ac.jp> <200411082327.iA8NRVMB084815@xl2.seyza.com> From: Juliusz Chroboczek Date: 21 Nov 2004 20:27:00 +0100 In-Reply-To: <200411082327.iA8NRVMB084815@xl2.seyza.com> Message-ID: User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.1 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-1.5.11 (shiva.jussieu.fr [134.157.0.168]); Sun, 21 Nov 2004 20:27:01 +0100 (CET) X-Miltered: at shiva.jussieu.fr with ID 41A0EC05.002 by Joe's j-chkmail (http://j-chkmail.ensmp.fr)! X-Antivirus: scanned by sophie at shiva.jussieu.fr X-BeenThere: gnu-arch-users@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: a discussion list for all things arch-ish List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: gnu-arch-users-bounces+migo=homemail.com@gnu.org Errors-To: gnu-arch-users-bounces+migo=homemail.com@gnu.org Status: RO Content-Length: 1219 Lines: 20 > How much experience is there with the merging practices that result > from that approach? On first principles I'm highly skeptical of it I believe that I'm one of the few people who have had an average- running darcs repository with two parallel branches, so I can answer that from first-hand experience. When they work, darcs merges work great. In my experience, darcs merges work as well as Arch merges, but they just ``do the right thing'' without the need for sync-tree and such. My general feeling is that Darcs merges are marginally better than Arch merges, which is much better than CVS or SVN, and should be good enough for anyone. The problems lie elsewhere. First, Darcs has no way of keeping merge history. More seriously, Darcs gets into serious performance problems after you've fixed a number of merge conflicts. I've had to resort to manually doing star-merge on my Darcs repositories for some time already, which is a pain. Juliusz _______________________________________________ Gnu-arch-users mailing list Gnu-arch-users@gnu.org http://lists.gnu.org/mailman/listinfo/gnu-arch-users GNU arch home page: http://savannah.gnu.org/projects/gnu-arch/