[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Gnu-arch-users] Re: --skip-present implemented
From: |
Robert Collins |
Subject: |
Re: [Gnu-arch-users] Re: --skip-present implemented |
Date: |
Tue, 09 Sep 2003 22:50:16 +1000 |
On Tue, 2003-09-09 at 22:33, Tom Lord wrote:
> That's the only caveat. You _say_ you do pure merges -- and you
> probably do -- but you'll have to maintain a discipline to be sure
> that that's _really_ what you do.
>
> The "danger scenario" here is that you set out to do a pure merge into
> your main branch. You do the merge and, let's say that the
> build/test reveals a minor unrelated bug or you notice some unrelated
> bug while fixing a merge conflict. Without thinking about it, you
> fix that one-line bug, then commit (along with the merge itself).
>
> Now your pure merge isn't pure because it contains changes other than
> the merge. If using --skip-present causes the impure patch that
> includes that bug-fix to be skipped, the bug fix is dropped.
Yep, thats the gotcha.
Worst case though, is to recreate that patch as a clean patch in one of
the merge-was-skipped branches.
Rob
--
GPG key available at: <http://members.aardvark.net.au/lifeless/keys.txt>.
signature.asc
Description: This is a digitally signed message part
[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, 2003/09/10
- [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