Re: [Gnu-arch-users] Re: missing & star-merge

[Robert Collins]

On Wed, 2004-05-05 at 19:26, Stig Brautaset wrote:
> On May 05 2004, Jani wrote:
> > I don't know in what case --new and --skip-present behave differently in
> > replay.
> 
> My guess is that --new only applies the patches that are newer than the
> last patch in the current tree. So, if you've cherry-picked patch-17 but
> are missing patches 12-16 & 18-23, --new will replay only 18-23, but
> --skip-present will replay all missing patches.

skip-present and new should (I haven't checked :}) be orthogonal.

i.e. if the above example is extend - say patch-20 is a merge from you, 
replay will replay 12-16,18-23
replay --skip-present will do 12-16,18-19,21-23
replay --new will do 18-23
replay --new --skip-present will do 18-19,21-23

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

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