[Pkg-ltsp-devel] ltsp bzr branch

[Petter Reinholdtsen]

[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
  %

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.