[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Gnu-arch-users] Re: missing & star-merge
From: |
Stig Brautaset |
Subject: |
Re: [Gnu-arch-users] Re: missing & star-merge |
Date: |
Wed, 5 May 2004 11:51:37 +0100 |
User-agent: |
Mutt/1.3.28i |
On May 05 2004, Robert 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
> > > 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.
Of course! My bad. What I really sketched out is (my guess at) the
difference between bare replay and replay with the --new flag.
> 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
Yeah, I know that. Dunno what caused my confusion above...
Stig
--
brautaset.org
- [Gnu-arch-users] missing & star-merge, Jani Monoses, 2004/05/05
- Re: [Gnu-arch-users] missing & star-merge, Matthieu Moy, 2004/05/05
- Re: [Gnu-arch-users] missing & star-merge, Miles Bader, 2004/05/05
- Re: [Gnu-arch-users] missing & star-merge, Jani Monoses, 2004/05/05
- [Gnu-arch-users] Re: missing & star-merge, Stig Brautaset, 2004/05/05
- Re: [Gnu-arch-users] Re: missing & star-merge, Robert Collins, 2004/05/05
- Re: [Gnu-arch-users] Re: missing & star-merge,
Stig Brautaset <=
- Re: [Gnu-arch-users] Re: missing & star-merge, Milan Cvetkovic, 2004/05/05
- Re: [Gnu-arch-users] Re: missing & star-merge, Aaron Bentley, 2004/05/05
- Re: [Gnu-arch-users] Re: missing & star-merge, Milan Cvetkovic, 2004/05/05
- Re: [Gnu-arch-users] Re: missing & star-merge, Aaron Bentley, 2004/05/05
- Re: [Gnu-arch-users] Re: missing & star-merge, Jani Monoses, 2004/05/06
- [Gnu-arch-users] Re: Re: missing & star-merge, Stig Brautaset, 2004/05/05