Re: [Gnu-arch-users] diff markers/ star merge

[John A Meinel]

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
=:->

signature.asc
Description: OpenPGP digital signature