[Gnu-arch-users] star-merge: unable to merge unrelated trees

[Zenaan Harkness]

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="address@hidden"
archat="address@hidden/cpc--stable--1.0"

dmitria="address@hidden"
dmitriat="address@hidden/pco--devel--0.5"

partha="address@hidden"
parthat="address@hidden/cpc--parthDev--6.0"

zena="address@hidden"
zenat="address@hidden/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 address@hidden/pco--devel--0.5--patch-5 to greedy
revision library /home/zen/revlib
* found immediate ancestor revision in library
(address@hidden/pco--devel--0.5--patch-4)
* patching for this revision
(address@hidden/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