Re: [Gnu-arch-users] following branched branches

[Robert Collins]

On Sun, 2003-12-21 at 12:55, Dustin Sallings wrote:
>       So, I've got a branch of address@hidden/tla--devo--1.1 that has 
> some changes  not present in 1.2, but I would like to follow 1.2 with 
> my changes.  Branching my tree and trying to star-merge 1.2 in tells me 
> ``unable to merge unrelated trees.''  I assume I'd get the same the 
> other way around.
> 
>       What's the standard procedure for doing such a thing?

# get the last changes from 1.1
tla star-merge address@hidden/tla--devo--1.1
# follow the tag
tla replay address@hidden/tla--devo--1.2--base-0
# and grab the changes 
tla star-merge address@hidden/tla--devo--1.2


Rob
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.

signature.asc
Description: This is a digitally signed message part