bashareteam team mailing list archive

[Emilien Klein <emilien@xxxxxxxx>]

Guido,

I have noticed that your last commit, r27, was not what you actually
intended to do. You just deleted the file, not moved it. I suppose
that you have moved the file directly from the window manager, so
bazaar has seen that the original file has been deleted. I am sure
that if you perform a
    bzr status

you will see that there is a file BaShare/images/FRic.png that is unknown.

When you want to move a file, you have to do that from bazaar, for example
    bzr mv BaShare/FRic.png BaShare/images

I have corrected this is r28, but if you do a
    bzr update
there will be a conflict, so I propose that you manually remove the
file BaShare/images/FRic.png and then update, that will prevent an
unneeded conflict.

Cheers,
Emilien.