[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Gnu-arch-users] is star-merge right for me?
From: |
Robert Anderson |
Subject: |
Re: [Gnu-arch-users] is star-merge right for me? |
Date: |
18 Sep 2003 21:31:48 -0700 |
On Thu, 2003-09-18 at 21:24, Dustin Sallings wrote:
>
> Is star-merge the appropriate way to catch up my branch? It's doing
> something strange when I'm trying to update. I was around patch 167,
> but it's doing this:
>
> dustinti:~/prog/eprojects/tla-1.1-dustin/src/tla 587% tla star-merge
> address@hidden/tla--devo--1.1
> * build reference tree for address@hidden/tla--devo--1.1--patch-170
> * from archive cached: address@hidden/tla--devo--1.1--patch-100
> * patching for revision: address@hidden/tla--devo--1.1--patch-101
> * patching for revision: address@hidden/tla--devo--1.1--patch-102
> [...]
> * star-merge by
> delta(address@hidden/tla--devo--1.1--patch-167,address@hidden
> 2003b/tla--devo--1.1--patch-170)[/Users/dustin/prog/eprojects/tla-1.1-
> dustin/src/tla]
> * build reference tree for address@hidden/tla--devo--1.1--patch-167
> * from archive cached: address@hidden/tla--devo--1.1--patch-100
> * patching for revision: address@hidden/tla--devo--1.1--patch-101
> [..]
>
> It seems to be doing a lot of work.
You mean in building the reference tree? No biggie. You might want to
either cacherev in a few spots on the tla--devo--1.1 line (between
patch-100 and the latest revision), or maybe create a revision library
for that version.
Bob