Bazaar

How to remove working tree (can't get it updated)?

Asked by Perry

Using tortoisebzr on Windows, I created a shared repository then a tree in a folder inside of it -- all on a shared file server. Then on a client, I did a checkout, added my code, committed. Then I developed & committed for a while.

\\fileserver\Repos\myproject\.bzr == has magic "shared repo" stuff I suppose

\\fileserver\Repos\myproject\trunk == my main branch (actually my only one)

\\fileserver\Repos\myproject\trunk\.brz = has more magic stuff -- maybe just pointers to the "shared repo" magic stuff?

Now I noticed that the server copy does not have an updated working tree, which would be convenient to have. So (using tortoisebzr) I did Update/Update working tree from the latest changes in the branch -- on that trunk folder on the shared file server.

I expected to get a latest copy of the working tree showing directly in the file server folders, under the trunk folder.

But I got two copies of every file, a .BASE copy and a .OTHER copy, like so:

\\fileserver\Repos\myproject\trunk\ChangeLog.txt.BASE
\\fileserver\Repos\myproject\trunk\ChangeLog.txt.OTHER

That isn't what I wanted, and I don't know what to do next. Maybe delete all the working tree and update all over from scratch?

But this is my "master" repository, so I don't know a safe way to delete the working tree.

I suppose that the .BASE reflects a previous state, and the .OTHER reflects all the commits I've done since then, but I don't know how to make it just collapse them all together into the latest version.

Question information

Language:
English Edit question
Status:
Answered
For:
Bazaar Edit question
Assignee:
No assignee Edit question
Last query:
Last reply:
Revision history for this message
Martin Pool (mbp) said : 		#1

Hi Perry,

Those BASE and OTHER files indicate that there are some conflict in the checkout on the fileserver - perhaps because somebody else has made modifications to the files there. You can see what's new by running 'bzr diff' on that tree (click "Diff" in Explorer).

If you just want to get rid of them, choose Bazaar/Work/Revert Working Tree and you should then have a clean copy of the working tree again.

Can you help with this problem?

Provide an answer of your own, or ask Perry for more information if necessary.

To post a message you must log in.