how to revert update operation

Alexander Belchenko bialix at ukr.net
Tue Jul 18 12:59:18 BST 2006


Today I did mistake. I have a branch on local machine that bound to
another remote branch. Yesterday I work offline from remote branch and
all commits did with --local option. Today I try to continue my work and
during first commit I've got message about divergence between local and
master branch, and bzr suggest me unbind, update or commit wit --local flag.

My mistake was I ran update. As result all my work is lost. At least all
local revisions is lost.

Is there is any chance to ressurect my --local work? I don't remember
revid, but may be there is hidden command to browse all revisions that
present in repository? Or after update this revisions simply throwed away?

I assume that I need to do merge instead of update.

So probably right way is after --local commit:

1) unbind local branch
2) make merge between local and master branch
3) make both branch identhical
4) bind local branch again

I understand correctly?

--
Alexander





More information about the bazaar mailing list