Message-ID: <41A15719.60607@arbash-meinel.com>
Date: Sun, 21 Nov 2004 21:03:53 -0600
From: John A Meinel <john@arbash-meinel.com>
User-Agent: Mozilla Thunderbird 0.9 (Windows/20041103)
MIME-Version: 1.0
To: Aaron Bentley <abentley@panoramicfeedback.com>
Subject: Re: [Gnu-arch-users] diff markers/ star merge
References: <1101070919.6134.11.camel@localhost.localdomain>	<41A112A4.4070207@panoramicfeedback.com>
	<20041121222245.GC23410@rogers.com>
	<41A1161D.7020708@arbash-meinel.com>
	<41A1237C.6020303@panoramicfeedback.com>
	<41A12400.9080901@arbash-meinel.com>
	<41A15380.6020907@panoramicfeedback.com>
In-Reply-To: <41A15380.6020907@panoramicfeedback.com>
Cc: arch <gnu-arch-users@gnu.org>, "Dimitrie O. Paun" <dpaun@rogers.com>,
        Zenaan Harkness <zen@cashpoolcomps.com>
Precedence: list
Content-Type: multipart/mixed; boundary="===============1972487543=="
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: 1837
Lines: 64
This is an OpenPGP/MIME signed message (RFC 2440 and 3156)
--===============1972487543==
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="------------enig6327131A4EC74F4E3E9A31D9"

This is an OpenPGP/MIME signed message (RFC 2440 and 3156)
--------------enig6327131A4EC74F4E3E9A31D9
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

Aaron Bentley wrote:
> John A Meinel wrote:
> 
>> gotcha. Because apply-delta grabs the pre and post to create the 
>> changeset, and the just applies that changeset. Silly me.
> 
> 
> I've been working on getting apply-delta --three-way working, but 
> somewhat hindered by the fact that you broke star-merge --three-way.
> 
> Aaron

Who broke star-merge --three-way? I don't believe I did anything with 
it. (naturally, I could be wrong.)

And, of course, what is broken about it?

John
=:->

--------------enig6327131A4EC74F4E3E9A31D9
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (Cygwin)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFBoVccJdeBCYSNAAMRAq/pAKC3LadCVyUxcD6No/RWar7LsxBkDQCdHVU0
PcjnPMx5b/O3/w1TGNIzAWA=
=0iUO
-----END PGP SIGNATURE-----

--------------enig6327131A4EC74F4E3E9A31D9--


--===============1972487543==
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/
--===============1972487543==--