[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnu-arch-users] Merge problems with tla
From: |
Momchil Velikov |
Subject: |
[Gnu-arch-users] Merge problems with tla |
Date: |
21 Oct 2003 12:32:05 +0300 |
User-agent: |
Gnus/5.09 (Gnus v5.9.0) Emacs/21.3.50 |
I have archives setup like this:
$ tla abrowse address@hidden/gcc
address@hidden
gcc
gcc--esol
gcc--esol--1.0
base-0 .. patch-3
gcc--mainline
gcc--mainline--3.3
base-0
$ tla abrowse address@hidden/gcc
address@hidden
gcc
gcc--esol
gcc--esol--1.0
base-0
gcc--mainline
gcc--mainline--3.3.2
base-0 .. patch-1
gcc--mainline--3.3
base-0
where versions are related like this:
gcc/gcc--mainline--3.3--base-0 <--tag--- gcc/gcc--esol--1.0
^ ^
| |
tag gcc/gcc--esol--1.0--patch-3
| ^
| |
| tag
| |
work/gcc--mainline--3.3--base-0 work/gcc--esol--1.0--base-0
^
|
tag
|
work/gcc--mainline--3.3.2--base-0
^
|
work/gcc--mainline--3.3.2--base-0--patch-1
gcc--mainline--3.3 is certain 3.3 (prerelease) import, gcc--esol--1.0
is the local changes branch, gcc--mainline--3.3.2 is the 3.3.2
release.
Now I want to merge changes between work/gcc-mainline--3.3-base-0
and work/gcc--mainline--3.3.2--patch-1 into
work/gcc--esol--1.0--base-0, thus forming work/gcc--esol--1.0--patch-1
However:
$ tla tree-version
address@hidden/gcc--esol--1.0
$ tla missing -s gcc--mainline--3.3
base-0
tag of address@hidden/gcc--mainline--3.3--base-0
$ tla star-merge gcc--mainline--3.3
star-merge: unable to merge unrelated trees.
$ tla missing -s gcc--mainline--3.3.2
base-0
tag of address@hidden/gcc--mainline--3.3--base-0
patch-1
imported GCC 3.3.2
$ tla star-merge gcc--mainline--3.3.2
* build reference tree for address@hidden/gcc--mainline--3.3.2--patch-1
* from revision library: address@hidden/gcc--mainline--3.3--base-0
* patching for revision: address@hidden/gcc--mainline--3.3.2--base-0
* patching for revision: address@hidden/gcc--mainline--3.3.2--patch-1
star-merge: unable to merge unrelated trees.
How can I achive this: incorporate new release into the local changes
?
~velco
- [Gnu-arch-users] Merge problems with tla,
Momchil Velikov <=
- Re: [Gnu-arch-users] Merge problems with tla, Robin Farine, 2003/10/21
- Re: [Gnu-arch-users] Merge problems with tla, Momchil Velikov, 2003/10/21
- Re: [Gnu-arch-users] Merge problems with tla, Alexander Deruwe, 2003/10/21
- Re: [Gnu-arch-users] Merge problems with tla, Robin Farine, 2003/10/21
- Re: [Gnu-arch-users] Merge problems with tla, Miles Bader, 2003/10/21
- Re: [Gnu-arch-users] Merge problems with tla, Momchil Velikov, 2003/10/21
- Re: [Gnu-arch-users] Merge problems with tla, Miles Bader, 2003/10/21
- Re: [Gnu-arch-users] Merge problems with tla, zander, 2003/10/21
- Re: [Gnu-arch-users] Merge problems with tla, Robin Farine, 2003/10/21