kicad-developers team mailing list archive

[Milan Horák <konference@xxxxxxx>]

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