Restoring after a bzr push.

[James Westby]

On Wed, 2008-02-27 at 11:03 +0000, raindog at macrohmasheen.com wrote:
> So, I managed to do a 'bzr push mylocaldir' in a my repo where there existed my branch "mylocaldir" effectively hat happened is it deleted my branch. To questions:
> 
> 1. How do I undo that
> 2. I think you should not be allowed to do that...

Hi,

I'd like to help you recover from this problem, however it is
not exactly clear to me what the problem is.

If you do "bzr push dir" where "dir" is an existing branch then
bzr will attempt to synchronise "dir" to be the same as the branch
that you are normally in.

This means that if it is a completely unrelated branch, or there
have been commits in "dir" you will receive an error message.

If you have only done commits in the branch that you are
currently in then they will be pushed to "dir". This means
that you can get "dir" back to the state that it was using
"uncommit" or "pull --overwrite". You can use "bzr log" to
see what revision you were at before.

Could you please explain what "effectively what happened is
it deleted my branch" means? Is the directory gone? Is it
empty? Does it contain different code?

Thanks,

James