Re: [Pika-dev] pika-0.1pre4 tarball broken

[Robert Collins]

On Sun, 2003-12-07 at 05:50, Tom Lord wrote:

> [Rob: should --skip-present add the logs for patches it skips?
>  An advantage is that it would have avoided this problem;  a
>  disadvantage is that someone blows pure-merge discipline that
>  it's harder to figure that out by looking at the logs to see what
>  --skip-present skipped.]

replay --skip-present - no:

*) Adding the logs to a otherwise single-patch merge violates that
singleness constract, and will make building skip-present using tools
harder.
*) generating them IFF there are no patches outstanding, results in
ping-pong 'merge of skipped patch patch-logs' patches, that was the
problem with my initial outside-of-arch script - and the reason why
skip-present needed to be inside arch.

pure-merge (an existing script I have in my arch-utils category) -
maybe:

* This /is/ a user level tool, and can be smart - merge in each patch ,
and follow up with a sync-tree/merge of skipped patch patch-logs IFF one
or more real patches was committed.
* Or, collapse N skipped-patches into one, and then follow that up with
the same IFF some patches where grabbed.

skip-present wasn't ever intended to be a primary user level tool,
rather a key element in smarter merge algorithms, which for me at least
;) it is. 

Rob

-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.

signature.asc
Description: This is a digitally signed message part