Subject: Re: [Gnu-arch-users] Re: darcs vs tla
From: Catalin Marinas <catalin.marinas@arm.com>
To: Thomas Lord <lord@emf.net>
In-Reply-To: <200411082327.iA8NRVMB084815@xl2.seyza.com>
References: <20041107234609.7bf0abfe@delta.hk.office.outblaze.com>
	<tnxlldcbqm1.fsf@arm.com> <877jowbl8w.fsf@tleepslib.sk.tsukuba.ac.jp>
	<200411082327.iA8NRVMB084815@xl2.seyza.com>
Content-Type: text/plain
Message-Id: <1099996596.2900.96.camel@stargate>
Mime-Version: 1.0
Date: Tue, 09 Nov 2004 10:36:36 +0000
Content-Transfer-Encoding: 7bit
Cc: gnu-arch-users@gnu.org, stephen@xemacs.org, timw@outblaze.com
Precedence: list
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: 1067
Lines: 28
On Mon, 2004-11-08 at 23:27, Thomas Lord wrote:
> So: does Darcs' merge operators (the deep distinction it has from
> arch) really "add value"?  at scale?   What's up with those?   Does
> anyone actually /know/?

What the darcs operators can do is happily merge a patch which adds some
lines at the end of an existing patch (which is not merged). Arch would
fail this because the diff context contains the patch which is not
merged. This might not be good for C language files but might be OK for
makefiles.

Another interesting thing the operators remove is the need for file ids.
If the P1 patch modifies a file's name and P2 adds some text to this
file, P2 can be properly merged into a tree which does not contain P1
because the commutation operators would change the P2 patch so that it
applies the changes to the original file name.

Catalin


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