kicad-developers team mailing list archive

[Lorenzo Marcantonio <l.marcantonio@xxxxxxxxxxxx>]

A strange thing happened today... I did a bzr up in the pristine (i.e.
vendor, 'official') branch and it signalled a conflict on
dialog_3D_view_option.cpp

This, of course have no sense since I don't make any modification to
that checkout (otherwise I wouldn't have called it pristine branch:P).
It's a checkout in fact, bzr info says:

Checkout (format: 2a)
Location:
       checkout root: .
  checkout of branch: bzr+ssh://bazaar.launchpad.net/+branch/kicad/

Even doing a bzr revert, status still shows some modified files (???)

Can it be caused by the 'rules' file suggested a while ago? isn't that
yet safe to use?

Or maybe I just need to update bzr (I have 2.5b4 which is, well, more
than an year old:P)

-- 
Lorenzo Marcantonio
Logos Srl