[Top][All Lists]

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

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

From: Jani Monoses
Subject: Re: [Gnu-arch-users] missing & star-merge
Date: Wed, 5 May 2004 11:48:12 +0300

On Wed, 5 May 2004 03:48:31 -0400
Miles Bader <address@hidden> wrote:

> On Wed, May 05, 2004 at 09:28:50AM +0200, Matthieu Moy wrote:
> > It's already there in "missing" !
> > 
> > tla missing address@hidden/project-to--merge--1.0
> > 
> > Will do it.
> It's not entirely equivalent -- star-merge is like update, it uses a delta,
> so it's posssible for missing to show you some patches that won't actually
> be merged.
> I think a `--new' option for missing, analogous to the one in `replay',
> might get you closer.

Looking closer I find that missing --skip-present gives the right answer for
my case, it ignores patches in the other branch which are merges from this
one. Maybe what Miles suggests solves a more generic case?
I don't know in what case --new and --skip-present behave differently in


reply via email to

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