Re: [Gnu-arch-users] Merging with the other branches.

[Aaron Bentley]

Miles Bader wrote:

> On Fri, Jan 02, 2004 at 06:17:06PM -0500, Aaron Bentley wrote:
>  
>
> > You might want to use star-merge instead of replay.
> > "tla star-merge test--trunk--0.1"
> > This will automatically procduce a log entry like this:
> >    
>
> ??? star-merge doesn't produce _any_ log entries...
>
> log-for-merge (and the various commit options that use it like -s, -L) will
> produce a log like you show, but that will probably be the same whether you
> use star-merge or replay (or update or ...).
>  
Okay, I guess I'm flat wrong.  I don't remember using the log-for-merge 
command, but I must have.

Aaron