From: Zenaan Harkness <zen@CashPoolComps.com>
To: arch <gnu-arch-users@gnu.org>
Content-Type: text/plain
Content-Transfer-Encoding: 7bit
Message-Id: <1103504548.30881.678.camel@localhost.localdomain>
Mime-Version: 1.0
Date: Mon, 20 Dec 2004 12:02:29 +1100
Subject: [Gnu-arch-users] star-merge: unable to merge unrelated trees
Precedence: list
Sender: gnu-arch-users-bounces+migo=homemail.com@gnu.org
Errors-To: gnu-arch-users-bounces+migo=homemail.com@gnu.org
Status: RO
Content-Length: 1833
Lines: 74
We have a very simple setup here - a STABLE branch which we (two full
time and one part time developers) use as a pivot branch for merging.
Stable is called "arch", and each user is as according to their home
directory setup.

users/ archives:

arch (STABLE)
parth
zen
dmitri

And I have the following env:

archa="arch@cashpoolcomps.com--2004-cpc"
archat="arch@cashpoolcomps.com--2004-cpc/cpc--stable--1.0"

dmitria="dmitri@pco.c--2005"
dmitriat="dmitri@pco.c--2005/pco--devel--0.5"

partha="parth@cashpoolcomps.com--cpcParthArchive04"
parthat="parth@cashpoolcomps.com--cpcParthArchive04/cpc--parthDev--6.0"

zena="zen@cashpoolcomps.com--2004"
zenat="zen@cashpoolcomps.com--2004/cpc--devel--0.2"

-------------------------------
Goal: we want to do a test release of dmitri branch first. Then later we
want to merge that into our stable tree, if after a few days testing, it
proves to have little or no bugs. So:

if I do the following as user zen, I get an error:

$ tla get $parthat t
...
$ cd t

$ tla star-merge --three-way $dmitriat
* auto-adding dmitri@pco.c--2005/pco--devel--0.5--patch-5 to greedy
revision library /home/zen/revlib
* found immediate ancestor revision in library
(dmitri@pco.c--2005/pco--devel--0.5--patch-4)
* patching for this revision
(dmitri@pco.c--2005/pco--devel--0.5--patch-5)
star-merge: unable to merge unrelated trees.


However, if I do the following, it works just fine:

$ tla get $archat t
...
$ cd t

$ tla star-merge --three-way $parthat
...

$ tla star-merge --three-way $dmitriat


Is this to be expected?

Has something gone wrong in our archives?

Thanks in advance
Zen


_______________________________________________
Gnu-arch-users mailing list
Gnu-arch-users@gnu.org
http://lists.gnu.org/mailman/listinfo/gnu-arch-users

GNU arch home page:
http://savannah.gnu.org/projects/gnu-arch/