[Pkg-ltsp-devel] ltsp bzr branch

[Gustavo Franco]

On 1/28/06, Petter Reinholdtsen <pere at hungry.com> wrote:
>
> [Carlos Laviola]
> > I've done this last week, actually. They're all available at
> >
> > https://dna.rits.org.br/~claviola/bzr-archives/pere/ltsp-{debian,fixes,ubuntufixes}
>
> I tried using this (the ltsp-debian branch) with one of the branches
> from Oliver on
> <URL:http://people.ubuntu.com/~ogra/bzr-archive/ltsp/sound>, and get
> this message:
>
>   % bzr merge ../sound/
>   bzr: ERROR: bzrlib.errors.UnrelatedBranches: Branches have no common
>       ancestor, and no base revision specified.
>     at /usr/lib/python2.4/site-packages/bzrlib/merge.py line 528
>     in set_base
>   %

Hi Pere,

I think that's right, since both repositories have no common ancestor.

> How can I merge the changes from Oliver into a branch based on my
> original ltsp-debian branch?  I wanted to continue working on the next
> version of the debian package based on the last release.

You will be able to do that merging from the pkg-ltsp branch (when
ready) and applying the ogra's patches that you need to your own. 
Btw, I thought we were going to follow the pkg-ltsp thing, like i
suggested in the first message of this thread[0], no? Can you reply
that message, please ?

[0] = http://lists.alioth.debian.org/pipermail/pkg-ltsp-devel/2006-January/000026.html

Cheers,
Gustavo Franco