[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Gnu-arch-users] Cascading patchlogs with star-merge
From: |
Robert Collins |
Subject: |
Re: [Gnu-arch-users] Cascading patchlogs with star-merge |
Date: |
Mon, 22 Mar 2004 09:10:17 +1100 |
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
[Gnu-arch-users] Re: Cascading patchlogs with star-merge, Stig Brautaset, 2004/03/21
Re: [Gnu-arch-users] Cascading patchlogs with star-merge, Robert Collins, 2004/03/21