[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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

From: Milan Cvetkovic
Subject: Re: [Gnu-arch-users] Re: missing & star-merge
Date: Wed, 05 May 2004 09:55:08 -0400
User-agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.3.1) Gecko/20030425

Robert Collins wrote:
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

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

Thanks for this explanation :-)

Going back to star-merge, I am still not sure what exactly it does.

In the above scenario, what would star-merge do, by applying delta?
a) delta(12,16) + delta(18,23), or
b) delta(18,23), or
c) delta(12,23) - delta(17,18)

I think it is (b), but I am not sure how to retrieve "18" without running "star-merge".

Thanks, Milan.



Gnu-arch-users mailing list

GNU arch home page:

reply via email to

[Prev in Thread] Current Thread [Next in Thread]