[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnu-arch-users] is star-merge right for me?
From: |
Dustin Sallings |
Subject: |
[Gnu-arch-users] is star-merge right for me? |
Date: |
Thu, 18 Sep 2003 21:24:10 -0700 |
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.
I did just undefine and redefine the location of address@hidden
if that makes a difference.
Previously, I've used replay to perform these updates and it seemed to
do a lot less work.
--
SPY My girlfriend asked me which one I like better.
pub 1024/3CAE01D5 1994/11/03 Dustin Sallings <address@hidden>
| Key fingerprint = 87 02 57 08 02 D0 DA D6 C8 0F 3E 65 51 98 D8 BE
L_______________________ I hope the answer won't upset her. ____________
- [Gnu-arch-users] is star-merge right for me?,
Dustin Sallings <=