[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Gnu-arch-users] star-merge vs apply-delta
From: |
Matthieu Moy |
Subject: |
Re: [Gnu-arch-users] star-merge vs apply-delta |
Date: |
Fri, 07 May 2004 12:44:56 +0200 |
User-agent: |
Gnus/5.1002 (Gnus v5.10.2) Emacs/21.2 (gnu/linux) |
Robert Collins <address@hidden> writes:
> AIUI three-way actually does two things to the patch behaviour
> *) turns on --forward
> *) turns on the <<<, ===, >>> style markers
That's a side effect of the mechanism, but the way it works is
actually different.
--three-way calls diff3 on the common ancestor, your version and mine.
It's not aware of the history that lead your version and mine to this
point.
Without --three-way, conflicts solved by --forward can come from
* Two developers doing the same change by hand (typically for a
trivial bugfix)
* Merging a patch which is actually a merge from you.
The usual star-merge can distinguish the two behaviors with
--skip-present, but diff3 and therefore --three-way can not AFAIK.
--
Matthieu
- Re: [Gnu-arch-users] [MERGE REQUEST: lord] documentation and help enhancements, Tom Lord, 2004/05/05
- Re: [Gnu-arch-users] [MERGE REQUEST: lord] documentation and help enhancements, Robin Green, 2004/05/05
- Re: [Gnu-arch-users] [MERGE REQUEST: lord] documentation and help enhancements, Andrew Suffield, 2004/05/06
- Re: [Gnu-arch-users] [MERGE REQUEST: lord] documentation and help enhancements, Tom Lord, 2004/05/06
- Re: [Gnu-arch-users] [MERGE REQUEST: lord] documentation and help enhancements, Aaron Bentley, 2004/05/06
- Re: [Gnu-arch-users] [MERGE REQUEST: lord] documentation and help enhancements, Tom Lord, 2004/05/06
- Re: [Gnu-arch-users] [MERGE REQUEST: lord] documentation and help enhancements, Aaron Bentley, 2004/05/06
- [Gnu-arch-users] star-merge vs apply-delta (was: [MERGE REQUEST: lord] documentation and help enhancements), Stefan Monnier, 2004/05/06
- Re: [Gnu-arch-users] star-merge vs apply-delta (was: [MERGE REQUEST: lord] documentation and help enhancements), Miles Bader, 2004/05/06
- Re: [Gnu-arch-users] star-merge vs apply-delta (was: [MERGE REQUEST: lord] documentation and help enhancements), Robert Collins, 2004/05/07
- Re: [Gnu-arch-users] star-merge vs apply-delta,
Matthieu Moy <=
- [Gnu-arch-users] Re: star-merge vs apply-delta, Stefan Monnier, 2004/05/09