Message-ID: <41A1161D.7020708@arbash-meinel.com>
Date: Sun, 21 Nov 2004 16:26:37 -0600
From: John A Meinel <john@arbash-meinel.com>
User-Agent: Mozilla Thunderbird 0.9 (Windows/20041103)
MIME-Version: 1.0
To: "Dimitrie O. Paun" <dpaun@rogers.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>
In-Reply-To: <20041121222245.GC23410@rogers.com>
Cc: Aaron Bentley <abentley@panoramicfeedback.com>,
        arch <gnu-arch-users@gnu.org>, Zenaan Harkness <zen@cashpoolcomps.com>
Precedence: list
Content-Type: multipart/mixed; boundary="===============1059093973=="
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: 2495
Lines: 76
This is an OpenPGP/MIME signed message (RFC 2440 and 3156)
--===============1059093973==
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="------------enig4FE7442E2126A9D9CE56B716"

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

Dimitrie O. Paun wrote:
> On Sun, Nov 21, 2004 at 05:11:48PM -0500, Aaron Bentley wrote:
> 
>>Zenaan Harkness wrote:
>>
>>
>>>So, I can tla undo, tla star-merge then tla redo, except when I tla redo
>>>I get the .rej conflict files rather than diff3 in-file markers.
>>
>>I realize that .rej files may be unfamiliar, but now that I'm used to 
>>them, I find them quite readable.  The top half shows the text the patch 
>>was expecting, the bottom shows what the patch tried to turn it into.
> 
> 
> Maybe, but I still like the inline markers a *lot* more. 
> How can one get them?
> 

I don't know if it is possible to get the inline markers without 
star-merge. I could be wrong, but this is my understanding.

The issue is that a patch file has a little bit of context, but if that 
context doesn't match, then you don't really have idea where it should 
go. star-merge --three-way gets around this by having an old reference 
version, which has to match the old form of the patch. That gives you a 
full file worth of context, and can tell you what the difference should be.

Could apply delta be modified to support a reference version?

John
=:->

--------------enig4FE7442E2126A9D9CE56B716
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

iD8DBQFBoRYgJdeBCYSNAAMRAo0FAKCO69nCTGJh+WQ85PpBJr3N6tvtiQCfQFON
PABMI46Be2CP80ObY36Pa1Y=
=TZyV
-----END PGP SIGNATURE-----

--------------enig4FE7442E2126A9D9CE56B716--


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