[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Gnu-arch-users] Broken trees?
|
From: |
Adrian Irving-Beer |
|
Subject: |
Re: [Gnu-arch-users] Broken trees? |
|
Date: |
Wed, 28 Apr 2004 10:39:36 -0400 |
|
User-agent: |
Mutt/1.5.5.1+cvs20040105i |
On Mon, Apr 26, 2004 at 11:02:14PM +0200, Frederic Gedin wrote:
> star-merge: unable to merge unrelated trees.
In the past, whenever I've gotten this message (caveat: once? twice?),
I've just used 'join-branch' and had no issues.
If FROM is the version that you want to merge from, and TO is the tree
you want to merge into (but that refuses to merge), change into TO and
do 'tla join-branch FROM', followed by 'tla star-merge FROM'.
I obviously can't guarantee they'll merge correctly, but AFAIK,
join-branch just puts the base-0 log from FROM into TO, such that the
trees are now officially related.
signature.asc
Description: Digital signature
- [Gnu-arch-users] Broken trees?, Frederic Gedin, 2004/04/26
- Message not available
- Message not available
- Re: [Gnu-arch-users] Broken trees?,
Adrian Irving-Beer <=