Date: Tue, 16 Nov 2004 16:12:32 +0800
From: Cameron Patrick <cameron@patrick.wattle.id.au>
To: gnu-arch-users@gnu.org
Subject: Re: [Gnu-arch-users] Re: darcs vs tla
Message-ID: <20041116081231.GS10330@patrick.wattle.id.au>
Mail-Followup-To: gnu-arch-users@gnu.org
References: <20041107234609.7bf0abfe@delta.hk.office.outblaze.com>
	<tnxlldcbqm1.fsf@arm.com>
	<D4D5B1A3-31DC-11D9-B0B3-000393CFE6B8@spy.net>
	<1099995711.2900.84.camel@stargate>
	<1100306258.7511.56.camel@localhost>
	<20041113122841.GA13424@fencepost>
Mime-Version: 1.0
In-Reply-To: <20041113122841.GA13424@fencepost>
Organization: Parenthesis Conspiracy
User-Agent: Mutt/1.5.6+20040803i
Precedence: list
Content-Type: multipart/mixed; boundary="===============0657863308=="
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: 2177
Lines: 74

--===============0657863308==
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="gj572EiMnwbLXET9"
Content-Disposition: inline


--gj572EiMnwbLXET9
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Miles Bader wrote:

> > Arch can do single patch merges, I wrote pure-merge.sh ages ago (2 years
> > I think) which does precisely that, automatically, but doesn't handle
> > all the cases of conflicts that can occur. Andrew Suffield and I
> > hammered out the algorithm for handling those, but no ones implemented
> > it in the intervening time.=20
>=20
> Is there a text file or something describing this algorithm?

Historical mailing list archives.  (Side-track: A few days ago I tried
digging up gnu-arch-users archives to work out what the heck "pure
merge" and "prism merge" were - and couldn't find anything.  In
frustration I ended up downloading mbox files from various locations
and indexing them with lurker.  So now there's a complete(-ish),
easily searchable archive of this list at
    http://cp.yi.org/lurker/list/gnu-arch-users.en.html )

Anyway, the first post that I can see describing a pure merge
algorithm is here:

    http://cp.yi.org/lurker/message/20030525.000938.4f48d03d.en.html

Searching for "pure merge" or "idempotent merge" gives a bunch more
messages.

Cameron.


--gj572EiMnwbLXET9
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)

iD8DBQFBmbZvl1rlvh2uVnMRAhKIAJ0dbsYozBk3b7qSbJCAEKecDHX41gCeKRE8
wLPEFT9xQqZ5NMuBuOtrf4E=
=5U0t
-----END PGP SIGNATURE-----

--gj572EiMnwbLXET9--


--===============0657863308==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

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