Re: How to cope with patches sanely
On Mon, 25 Feb 2008 19:04:10 -0500, David Nusinow <firstname.lastname@example.org> said:
> On Mon, Feb 25, 2008 at 03:56:49AM -0600, Manoj Srivastava wrote:
>> No, it does not. If branch A has pi = 2.34567; and branch B has pi =
>> No matter how much quilting you do you cannot reconcile the
>> fundamental conflict in the final. Either pi is 3.14159; or it is
>> not; and if branch A requires pi not to be that value, and branch B
>> requires pi to be that value, quilt can't make C be quantum like and
>> have the value be both.
> Feature branches don't magically allow you to avoid merge conflicts
> either, so this is a red herring. Once you've resolved the conflict,
> then it becomes just another change. This change can become a diff in
> a stack of diffs.
This whole message is a red herring, since hte feature branches
do not attempt to handle merge conflicts -- that is not their purpose.
They capture one single feature, independently from every other
feature, and thumb their collective noses at merge conflicts.
The history of the integration branch captures the integration
effort; and the integration branch makes no effort to keep the
integration work up to date with current upstream and feature
If you think you can extract an up to date integration patch
from the entrails of the integration branch -- feel free o smack
me down. But please provide some substance to the assertion that it is
One friend in a lifetime is much; two are many; three are hardly
possible. Henry Adams
Manoj Srivastava <email@example.com> <http://www.debian.org/~srivasta/>
1024D/BF24424C print 4966 F272 D093 B493 410B 924B 21BA DABB BF24 424C