[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnu-arch-users] Re: --skip-present implemented
From: |
Miles Bader |
Subject: |
[Gnu-arch-users] Re: --skip-present implemented |
Date: |
11 Sep 2003 12:54:42 +0900 |
Tom Lord <address@hidden> writes:
> One issue is that star-merge should probably have a --forward option.
> That would actually eliminate many spurious conflicts in cases like
> this.
... but please don't call it `--forward'. Use something memorable like
`--ignore-duplicate-hunks' (note that in patch, --forward has _two_
effects, it ignores duplicate hunks, but it also ignores `apparently
reversed' patches; I would guess that tla should not do the latter).
I presume this would an option to dopatch (and thus all the various
merging commands), right?
-Miles
--
"Whatever you do will be insignificant, but it is very important that
you do it." Mahatma Gandhi
- [Gnu-arch-users] Re: --skip-present implemented, (continued)
- [Gnu-arch-users] Re: --skip-present implemented, Miles Bader, 2003/09/09
- [Gnu-arch-users] Re: --skip-present implemented, John Goerzen, 2003/09/09
- Re: [Gnu-arch-users] Re: --skip-present implemented, Tom Lord, 2003/09/10
- Re: [Gnu-arch-users] Re: --skip-present implemented, Stephen J. Turnbull, 2003/09/10
- [Gnu-arch-users] Re: --skip-present implemented,
Miles Bader <=
- [Gnu-arch-users] Re: --skip-present implemented, Tom Lord, 2003/09/11
- [Gnu-arch-users] Re: --skip-present implemented, Miles Bader, 2003/09/11
- [Gnu-arch-users] Re: --skip-present implemented, Tom Lord, 2003/09/11
- [Gnu-arch-users] Re: --skip-present implemented, Miles Bader, 2003/09/11