How can I merge three branches which have no common ancestors ?

Vincent LADEUIL v.ladeuil at alplog.fr
Tue Jan 24 14:48:49 GMT 2006


Hi,

I'm currently migrating from CVS to bzr.

Under CVS I had 3 modules hence the following dirs (files omitted
for clarity, they  only exist inside the dirs,  none are directly
under cvs-working-dir) :

cvs-working-dir/bin
cvs-working-dir/bin/CVS
cvs-working-dir/lib
cvs-working-dir/lib/CVS
cvs-working-dir/projet
cvs-working-dir/projet/CVS

Using 'tailor'  I was  able to create  three bzr  branches (again
files have  been omitted to  clarity and still exist  only inside
dirs, none are directly under tailor-wd):

tailor-wd/bin
tailor-wd/bin/.bzr
tailor-wd/lib
tailor-wd/lib/.bzr
tailor-wd/projet
tailor-wd/projet/.bzr


Now I want :

bzr-wd/.bzr
bzr-wd/bin
bzr-wd/lib
bzr-wd/projet

I tried  various combinations of  init/pull/move/merge but didn't
find  a  solution.  Each  time  I  try  to  "import"  the  second
directory,  the first  one  get  erased by  the  merge (the  pull
refuses to "add" to my branch).

Any advice ?

Should I just forget about keeping my history of modifications ?

Thanks in advance,

       Vincent





More information about the bazaar mailing list