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 iAC4xFiw000713
	for <migo@freeshell.org>; Fri, 12 Nov 2004 04:59:17 GMT
Received: from lists.gnu.org (lists.gnu.org [199.232.76.165])
	by spf3.us4.outblaze.com (Postfix) with ESMTP id 0701953B6D
	for <migo@homemail.com>; Fri, 12 Nov 2004 04:59:17 +0000 (GMT)
Received: from localhost ([127.0.0.1] helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33)
	id 1CSTfK-0007rJ-5K
	for migo@homemail.com; Fri, 12 Nov 2004 00:08:06 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CSTes-0007rD-VC
	for gnu-arch-users@gnu.org; Fri, 12 Nov 2004 00:07:39 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CSTes-0007r1-IH
	for gnu-arch-users@gnu.org; Fri, 12 Nov 2004 00:07:38 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CSTes-0007qy-Fy
	for gnu-arch-users@gnu.org; Fri, 12 Nov 2004 00:07:38 -0500
Received: from [144.140.71.12] (helo=gizmo02ps.bigpond.com)
	by monty-python.gnu.org with smtp (Exim 4.34) id 1CSTWA-0000du-PV
	for gnu-arch-users@gnu.org; Thu, 11 Nov 2004 23:58:39 -0500
Received: (qmail 6644 invoked from network); 12 Nov 2004 04:58:37 -0000
Received: from unknown (HELO psmam11.bigpond.com) (144.135.25.100)
	by gizmo02ps.bigpond.com with SMTP; 12 Nov 2004 04:58:37 -0000
Received: from cpe-144-132-221-212.nsw.bigpond.net.au ([144.132.221.212]) by
	psmam11.bigpond.com(MAM REL_3_4_2a 225/4032401) with SMTP id
	4032401; Fri, 12 Nov 2004 14:58:37 +1000
Received: by poolcompsonline.com (Postfix, from userid 1000)
	id 6A910783E7; Fri, 12 Nov 2004 16:01:24 +1100
Subject: Re: [Gnu-arch-users] Re: darcs vs tla
From: Zenaan Harkness <zen@cashpoolcomps.com>
To: Arch Users <gnu-arch-users@gnu.org>
In-Reply-To: <1100234280.7511.25.camel@localhost>
References: <20041107234609.7bf0abfe@delta.hk.office.outblaze.com>
	<slrncp74m0.ftv.jgoerzen@christoph.complete.org>
	<41939CEE.2010409@panoramicfeedback.com>
	<20041111174053.GA1818@excelhustler.com>
	<1100234280.7511.25.camel@localhost>
Content-Type: text/plain
Content-Transfer-Encoding: 7bit
Message-Id: <1100235684.3031.64.camel@localhost.localdomain>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.6 
Date: Fri, 12 Nov 2004 16:01:24 +1100
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 <gnu-arch-users.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnu-arch-users>,
	<mailto:gnu-arch-users-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnu-arch-users>
List-Post: <mailto:gnu-arch-users@gnu.org>
List-Help: <mailto:gnu-arch-users-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnu-arch-users>,
	<mailto:gnu-arch-users-request@gnu.org?subject=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: 804
Lines: 24
> > 2. This approach loses the diffs for each individual commit that was
> > done, at least in the master repository.
> 
> Sigh. pure-merge. Been there, done that, it works fine.

Yes it's doable. Yes arch supports all merge styles. No, arch doesn't
have the "simpleton's" UI built in (unless you consider scrounging the
lists for a pure-merge script, after determining that you really _want_
a pure merge script, then testing to see if everything's set up just
right, return to list for help when something's not quite right...).

<both right; rarely black and white; ...>

cheers
zen


_______________________________________________
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/