← Back to team overview

kicad-developers team mailing list archive

Re: bzr problem

 

Thanks a lot. That's it.

Milan

Dick Hollenbeck napsal(a):
Milan,

Since you will be reading from the source but not changing it, you should convert your working tree and branch to a "checkout", and after that you can use bzr basically like you used subversion before:



$  bzr help bind
Purpose: Convert the current branch into a checkout of the supplied branch.


now emboldened:

$ bzr bind

converts the branch to a "checkout" of the parent remote branch as launchpad.

Then you can do just like you did for subversion, an update:

$ bzr update

instead of a merge.

$ bzr help update

for details.

Dick


Hallo,

trying to 'bzr merge', but it writes

bzr: ERROR: Working tree "/home/mhorak/bzr/kicad/" has uncommitted changes (See bzr status).

'bzr status' reports

modified:
  cvpcb/cvstruct.h
  cvpcb/readschematicnetlist.cpp
  pcbnew/tool_pcb.cpp
pending merge tips: (use -v to see all merge revisions)
  jean-pierre charras 2010-04-13 fixed 2 minor bugs

Am I doing something wrong?

Did 'bzr branch' on 2345 revision and it went good. But no more.

Milan





References