[Gnu-arch-users] Re: Unable to merge unrelated trees

[Christian von Kietzell]

Oh, never mind, I found the problem. There was an old version of
ep-hws--home--0.2 in my revision library that was tagged from another
tree but I had removed that altogether before tagging from
ep-hws--main--0.2.

  Chris

On Thu, 2 Sep 2004 16:18:01 +0200, Christian von Kietzell
<address@hidden> wrote:
> Hi,
> 
> I've got two archives (address@hidden and
> address@hidden).
> In --work-2004 there is a project named ep-hws--main--0.2. In --2004
> there is ep-hws--home--0.2, which is a tag of the one in --work-2004.
> 
> I've added some patches to the main branch and now wanted to merge
> these into the home branch.
> When I try to (star-) merge the main branch into the home branch tla
> complains about being unable to merge unrelated trees, which they
> clearly aren't (I think).
> What am I doing wrong?
> 
> Cheers,
>   Chris
>