[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Gnu-arch-users] Star merging with 3 branches
From: |
Robert Collins |
Subject: |
Re: [Gnu-arch-users] Star merging with 3 branches |
Date: |
Wed, 10 Dec 2003 09:32:42 +1100 |
On Wed, 2003-12-10 at 09:20, Joshua Haberman wrote:
> Why can't you merge from smallfeatures to mainline using the following
> algorithm:
> - determine the most recent ancestor
> - for each changeset between the most recent ancestor and the newest
> revision on smallfeatures:
> - if there is no patch log for this changeset in mainline, apply
> this changeset to mainline. otherwise continue.
>
> Why is "subtracting out" required? The changesets that already exist in
> smallfeatures and its ancestors contain information at enough
> granularity to perform the desired operation: applying changes to
> mainline that smallfeatures has but mainline does not.
>
> I've asked this question repeatedly but never gotten an answer I
> understand.
You are describing roughly what pure-merge does, which uses replay
--skip-present.
This allows that patch flow very easily - but it depends upon a strict
discpline of clean changesets.
Rob
--
GPG key available at: <http://www.robertcollins.net/keys.txt>.
signature.asc
Description: This is a digitally signed message part
Re: [Gnu-arch-users] Star merging with 3 branches, Tom Lord, 2003/12/09
Re: [Gnu-arch-users] Star merging with 3 branches, Tom Lord, 2003/12/09
- Re: [Gnu-arch-users] Star merging with 3 branches, Joshua Haberman, 2003/12/09
- Re: [Gnu-arch-users] Star merging with 3 branches,
Robert Collins <=
- Re: [Gnu-arch-users] Star merging with 3 branches, Tom Lord, 2003/12/09
- Re: [Gnu-arch-users] Star merging with 3 branches, Joshua Haberman, 2003/12/09
- Re: [Gnu-arch-users] Star merging with 3 branches, Robert Collins, 2003/12/09
- Re: [Gnu-arch-users] Star merging with 3 branches, Tom Lord, 2003/12/09
- Re: [Gnu-arch-users] Star merging with 3 branches, Andrew Suffield, 2003/12/10
- Re: [Gnu-arch-users] Star merging with 3 branches, Robert Collins, 2003/12/10
- [Gnu-arch-users] pure-merge is impossible (was Re: Star merging with 3 branches), Tom Lord, 2003/12/10
- Re: [Gnu-arch-users] pure-merge is impossible (was Re: Star merging with 3 branches), Andrew Suffield, 2003/12/10
- Re: [Gnu-arch-users] pure-merge is impossible (was Re: Star merging with 3 branches), Tom Lord, 2003/12/11
- Re: [Gnu-arch-users] pure-merge is impossible (was Re: Star merging with 3 branches), Andrew Suffield, 2003/12/11