Joining unrelated branches

[jorgesmbox-ml at yahoo.es]

> I haven't tried it yet, but you can look at bzr-merge-into plugin:
> https://launchpad.net/bzr-merge-into/
>

Well, I just tried, and either I did something wrong or it doesn't work. Here are the steps of what i did:

$ mkdir test-repo
$ cd test-repo
$ bzr init
$ bzr merge-into ../MxPEGYarpComponent MxPEGYarpComponent
All changes applied successfully.
successful
$ bzr st
working tree is out of date, run 'bzr update'
removed:
  .bzrignore
  CMakeLists.txt
  HTTPGetStreamSourcePOSIX.cpp
  HTTPGetStreamSourcePOSIX.h
  IHTTPGetStreamSourceBasic.h
  IMxPEGRawFrameYarpPortWriter.h
  MxPEGRawFrameYarpPortWriter.cpp
  MxPEGRawFrameYarpPortWriter.h
  MxPEGYarpComponent.cpp
  uncrustify.cfg
$ bzr update
All changes applied successfully.
bzr: ERROR: Reserved revision-id {null:}
$  bzr st
working tree is out of date, run 'bzr update'
removed:
  .bzrignore
  CMakeLists.txt
  HTTPGetStreamSourcePOSIX.cpp
  HTTPGetStreamSourcePOSIX.h
  IHTTPGetStreamSourceBasic.h
  IMxPEGRawFrameYarpPortWriter.h
  MxPEGRawFrameYarpPortWriter.cpp
  MxPEGRawFrameYarpPortWriter.h
  MxPEGYarpComponent.cpp
  uncrustify.cfg

And this can go on and on. I then tried creating first the destination directory 

$ mkd¡r test-repo
$cd test-repo
$ bzr init
$ mkdir MxPEGYarpComponent
$ bzr commit
added MxPEGYarpComponent
Committed revision 1.
$ bzr merge-into ../MxPEGYarpComponent MxPEGYarpComponent
All changes applied successfully.
successful
$bzr st
pending merges:
  Jorge Scandaliaris 2008-06-27 Renamed interface IHTTPGetStreamSourcePOSIX to HTTPGetStreamSourceBasic, as POSIX refers to a specific im...
    Jorge Scandaliaris 2008-06-25 Beautified code with uncrustify-0.4.7. Added the configuration file used.
    Jorge Scandaliaris 2008-06-20 Minor formatting changes.
    Jorge Scandaliaris 2008-06-20 Added vim modeline.
    Jorge Scandaliaris 2008-06-14 Removed debug printouts.
    Jorge Scandaliaris 2008-06-13 Basic functional version.
    Jorge Scandaliaris 2008-06-05 Initial commit. Custom components for Mobotix's SDK including a source stream using POSIX sockets and a...
$ bzr commit
Committing to: /home/jscandal/urus/mobotix/test-repo/
Committed revision 2.   

So this seems to work but I have no files under MxPEGYarpComponent directory. Am I missing a command to bring them in? 

jorges


      ______________________________________________ 
Enviado desde Correo Yahoo! La bandeja de entrada más inteligente.