THIS, OTHER, BASE and moved files popping up (possibly bzr-svn)

[Klaas van Schelven]

Hi,

I'm trying to move gently in to the better world of bzr from the dark ages
of svn. I took a hint from the User Guide on easy transfers: bzr-svn. So I'm
running bzr on top of our joint, central svn account.

Today I was working alone, partially off line - so I have no concurrent
others to blame. As far as I remember I did the following.

* work happily offline, check everything in
* bzr ci -m "..."   a couple of times when no internet was available
* bzr up

I now have files like this (for about 30 original files this makes 210). xxx
is the only original
xxx
xxx.BASE
xxx.BASE.moved
xxx.OTHER
xxx.OTHER.moved
xxx.THIS
xxx.THIS.moved

* How did this happen? What is it I do not understand? How should I have
worked off line?
* How to recover - specifically, I'd like to fish back the changes I did
from these 7 files without too much manual editing.
* How do I tell bzr everything is ok? For files I've edited (and tossed out
the associated garbage) bzr st keeps reporting all kinds of moves and
backups like so:
  Conflict adding file xxx.THIS.  Moved existing file to xxx.THIS.moved.
even after bzr resolve.

Hope you can help,
Klaas
-------------- next part --------------
An HTML attachment was scrubbed...
URL: https://lists.ubuntu.com/archives/bazaar/attachments/20080818/855fbbef/attachment-0001.htm