Re: [Gnu-arch-users] Re: --skip-present implemented

[Robert Collins]

On Wed, 2003-09-10 at 07:27, Miles Bader wrote:
> I kind of wondered if it would good/bad/optional for replay --skip-present
> to actually add the patch-logs from skipped revisions (but regardless of
> desirability, it would probably be a slight pain to implement).

Thats what pure-merge did, and it could only do it because:
The delta between skip-present and pure-merge includes:
pure-merge does one merge at a time.
pure-merge generated a changelog and commits if no errors are
encountered.

Note that bringing across those patch logs is bad without those two
criteria, because you will cause situations where you cannot merge a
patch that you want to, because of a summary merge upstream overlapping
with a direct merge. pure-merge handles those safely, --reply on it's
own cannot.

In summary, pure-merge needed --skip-present to Do The Right Thing, but
in no way does --skip-present obsolete or replace pure-merge.

Rob

-- 
GPG key available at: <http://members.aardvark.net.au/lifeless/keys.txt>.

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