[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Gnu-arch-users] Star-merge Fatally Wounded
From: |
Jan Hudec |
Subject: |
Re: [Gnu-arch-users] Star-merge Fatally Wounded |
Date: |
Sat, 11 Sep 2004 13:54:56 +0200 |
User-agent: |
Mutt/1.5.6+20040818i |
On Sat, Sep 11, 2004 at 13:30:57 +0200, David Allouche wrote:
> On Fri, 2004-09-10 at 20:00 -0400, Adrian Irving-Beer wrote:
> > * Star-merge B into A works (but that's a false positive due
> > to too little input data; it fuzzies and does it wrong).
> >
> > * Star-merge A into B fails due to conflict.
> >
> > * Star-merge either using --three-way works perfectly.
> >
> > Interestingly, even though --three-way reports adding two patch logs
> > and modifying the file (*not* a conflict), it only adds one patch log
> > and doesn't make any changes to the file. Essentially, the merge
> > becomes a no-op (as one would expect).
> >
> > Is the three-way behaviour helpful at all in improving the normal
> > behaviour? Is it only working due to minimal input data?
>
> That's intriguing. I never really quite understood how --three-way
> affects the merge logic.
It does not. But diff3, having more information than just patch, does
a better job merging conflicting changes. Namely, if both branches
contain the same change, it causes a conflict with diff + patch, but not
with diff3.
-------------------------------------------------------------------------------
Jan 'Bulb' Hudec
<address@hidden>
signature.asc
Description: Digital signature
- Re: [Gnu-arch-users] Star-merge Fatally Wounded, (continued)
Re: [Gnu-arch-users] Star-merge Fatally Wounded, Aaron Bentley, 2004/09/10
- Re: [Gnu-arch-users] Star-merge Fatally Wounded, Tom Lord, 2004/09/10
- [Gnu-arch-users] Re: Star-merge Fatally Wounded, Stefan Monnier, 2004/09/10
- Re: [Gnu-arch-users] Star-merge Fatally Wounded, Matthieu Moy, 2004/09/10
- Re: [Gnu-arch-users] Star-merge Fatally Wounded, Aaron Bentley, 2004/09/10
- Re: [Gnu-arch-users] Star-merge Fatally Wounded, Zenaan Harkness, 2004/09/10
Re: [Gnu-arch-users] Star-merge Fatally Wounded, Adrian Irving-Beer, 2004/09/10
Re: [Gnu-arch-users] Star-merge Fatally Wounded, David Allouche, 2004/09/11
Re: [Gnu-arch-users] Star-merge Fatally Wounded,
Jan Hudec <=
Re: [Gnu-arch-users] Star-merge Fatally Wounded, David Allouche, 2004/09/10
Re: [Gnu-arch-users] Star-merge Fatally Wounded, Tom Lord, 2004/09/10
Re: [Gnu-arch-users] Star-merge Fatally Wounded, Zenaan Harkness, 2004/09/10
Re: [Gnu-arch-users] Star-merge Fatally Wounded, Matthew Dempsky, 2004/09/11