undo pull overwrite

Asked by vasili karras on 2012-07-02

Hi all,
please help needed; "bazaar pull" from master branch cancelled all changes on local branch.

I am working on a project with one of my friends using version 2.5.1, with a master branch via file system in a shared dropbox folder. I added and then commited into local branch all changes I have made to the project. Later on I did a merge and then a pull (probably with --overwrite) from master branch to local branch. The problem is I do not see revision before pull on local branch..it seems like I lost all local changes (three days and nights of work..:((( ) and the local branch was totally overwritten by master branch.
I googled a lot, but the only forums I found on the topic adviced to use command "bzr heads" to find out the lost revisions and then do a "revert" to that revision. The problem is command "heads" is no more abailable in new versions of bazaar and I cannot see the local revision from "bzr qlog" so that I can do a revert to that.

Do I have any chance to get back my local work or it is deleted by bazaar pull forever..:(? Is there a way (similar to deprecated heads command) to find out the local revision to revert to??

Please help would be appreciated.

thank you in advance.
Vasilis

Question information

Language:
English Edit question
Status:
Solved
For:
Bazaar Edit question
Assignee:
No assignee Edit question
Solved by:
vasili karras
Solved:
2012-07-05
Last query:
2012-07-05
Last reply:
2012-07-02
Jelmer Vernooij (jelmer) said : #1

On Mon, Jul 02, 2012 at 06:31:15PM -0000, vasili karras wrote:
> please help needed; "bazaar pull" from master branch cancelled all changes on local branch.

> I am working on a project with one of my friends using version 2.5.1, with a master branch via file system in a shared dropbox folder. I added and then commited into local branch all changes I have made to the project. Later on I did a merge and then a pull (probably with --overwrite) from master branch to local branch. The problem is I do not see revision before pull on local branch..it seems like I lost all local changes (three days and nights of work..:((( ) and the local branch was totally overwritten by master branch.
> I googled a lot, but the only forums I found on the topic adviced to use command "bzr heads" to find out the lost revisions and then do a "revert" to that revision. The problem is command "heads" is no more abailable in new versions of bazaar and I cannot see the local revision from "bzr qlog" so that I can do a revert to that.

> Do I have any chance to get back my local work or it is deleted by bazaar pull forever..:(? Is there a way (similar to deprecated heads command) to find out the local revision to revert to??

You might want to use:

bzr heads --dead-only

to find out the revision id of the revision you want to roll back to

After that you can use:

$ bzr pull -rrevid:THEREVID .

to go back to that revision.

("bzr heads" is part of the bzrtools plugin)

Cheers,

Jelme

vasili karras (vasil12) said : #2

Thank you very much Jelme!

your instructions worked greaat for me..it saved me a lot of rework:)

Cheers,
Vasilis