Re: [Gnu-arch-users] Cascading patchlogs with star-merge

[Robert Collins]

On Mon, 2004-03-22 at 08:17, Robert Anderson wrote:
> Robert Collins wrote:
> 
> >On Mon, 2004-03-22 at 06:27, Robert Anderson wrote:
> >  
> >
> >>Why should I have to merge it to find out it's something I didn't want?
> >>    
> >>
> >
> >You don't. tla missing --skip-present could be used to determine if
> >there are changes to merge - and you could then use tla star-merge to
> >perform the actual merge.
> >  
> >
> Ok, thanks.
> 
> The naming of that option seems counter-intuitive to me, though.  What's 
> present that I'm skipping?

you are skipping changesets which contain a patch-log already present in
your project tree.

Rob

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

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