[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Gnu-arch-users] --forward mostly harmless
From: |
Miles Bader |
Subject: |
Re: [Gnu-arch-users] --forward mostly harmless |
Date: |
Mon, 13 Sep 2004 12:27:16 -0400 |
User-agent: |
Mutt/1.3.28i |
On Mon, Sep 13, 2004 at 05:44:10PM +0200, David Allouche wrote:
> > It might be worth checking the sources to see if that's actually what the
> > command does.
>
> What do you mean?
I mean confirm that it only checks the first hunk when making the
apply/don't-apply decision.
> > For me, duplicate suppression of some sort is absolutely necessary,
> > but I usually use `star-merge --three-way' anyway...
>
> Are you saying you are actually using --forward and you get a different
> behaviour without --forward?
No, just that I need duplicate suppression.
I generally use star-merge --three-way, but I've always sort of counted on
being able to use --forward if necessary -- star-merge isn't appropriate for
every merging task. In particular, apply-delta and replay would benefit from
some sort duplicate suppression, as they're the sort of primitive command one
often turns to when star-merge doesn't work.
-Miles
--
P.S. All information contained in the above letter is false,
for reasons of military security.
- [Gnu-arch-users] --forward mostly harmless, David Allouche, 2004/09/12
- Re: [Gnu-arch-users] --forward mostly harmless, Tom Lord, 2004/09/12
- Re: [Gnu-arch-users] --forward mostly harmless, Miles Bader, 2004/09/13
- Re: [Gnu-arch-users] --forward mostly harmless, David Allouche, 2004/09/13
- Re: [Gnu-arch-users] --forward mostly harmless,
Miles Bader <=
- Re: [Gnu-arch-users] --forward mostly harmless, Aaron Bentley, 2004/09/13
- Re: [Gnu-arch-users] --forward mostly harmless, David Allouche, 2004/09/13
- Re: [Gnu-arch-users] --forward mostly harmless, Phil Frost, 2004/09/13
- Re: [Gnu-arch-users] --forward mostly harmless, Aaron Bentley, 2004/09/13
- Re: [Gnu-arch-users] --forward mostly harmless, David Allouche, 2004/09/13
- [Gnu-arch-users] Re: --forward mostly harmless, Stefan Monnier, 2004/09/13
- Re: [Gnu-arch-users] --forward mostly harmless, David Allouche, 2004/09/13
- Re: [Gnu-arch-users] --forward mostly harmless, James Blackwell, 2004/09/13
- Re: [Gnu-arch-users] --forward mostly harmless, Miles Bader, 2004/09/13
- Re: [Gnu-arch-users] --forward mostly harmless, James Blackwell, 2004/09/13