Some code was lost after bzr commit --local, bzr pull, bzr commit

Question

The developer on my team uses a branch bound to the server (IE, only by checking, updating, and committing), but also often uses the -local flag when committing, and then takes over the server in the package. Recently, she faced a situation where she there are not enough local commits, and they cannot find them in the repo or its local code. She suspects this is due to the fact that at some point she made an attempt to commit local commits, and server commits.

None of us have much experience with Bazaar. What could happen, and where can we look for this missing code? She is pretty sure she never did anything destructive, and I'm pretty sure Bazar would ask her if she would. I vaguely remember that Bazaar has the concept of “hidden” repositories / trees / wherever they are, before changing a bunch of code from which someone can recover the lost code, but I can’t get away from Google what it is.

Answer 1

I realized that the “hidden” repositions / trees / all I had in mind were the “dead heads” viewed with bzr heads .

We found our dead head and combined it - the code was saved!

 $ bzr heads $ # output shows various heads, with names like: revision-id: john@mycomputer-20100630175358-39qro1z5qdq2o9ay (dead) $ bzr merge john@mycomputer-20100630175358-39qro1z5qdq2o9ay 

Answer 2

If all else fails, you can try asking on the IRC channel in the bazaar.

Go there now * and wander into the channel #bzr. Usually there are people there, and they are usually helpful.

** This is a freenode web interface. If you have not used IRC yet, you create your own alias, select the channel #bzr and do not need authorization (while your nickname is unique). *

Answer 3

Anytime you can do

 bzr status 

and this will happen if there are any uncommitted changes, including mergers that have not been committed. This can help determine where everything is located. If you perform a merge and you did not execute it with commit (whether there were conflicts or not), the result of the merge will remain uncommitted.

Running bzr pull should not have destroyed any work - as I understand it, it should just crash if the local branch has uncommitted changes.