overwrote a branch
Loic J. Duros
lduros at gnu.org
Tue Jun 5 01:06:58 UTC 2012
Hello:
I have basically two branches in my repository: "dev" in which I do all
the dev work, and "trunk", in which I mostly merge stuff from dev when
I'm ready to create a new version.
My local dev branch is checked out from the remote one (on savannah).
Today I wanted to do 'bzr merge ../trunk' to get a commit I made on my
local trunk, but instead I did 'bzr pull ../trunk', and as a result my
remote and my local dev branch are just a copy of the trunk. I used to
have 889 revisions in dev, only 539 in trunk, but now both of them show
539. How can I get my old branch with the 889 commits? I should mention
that all the revisions from dev were probably merged to trunk, but it's
hard to tell since they get aggregated under a new number and commit text.
here is the dev branch:
http://bzr.savannah.gnu.org/lh/librejs/dev/changes/541
and here is the trunk: http://bzr.savannah.gnu.org/lh/librejs/trunk/changes
Many thanks for your help,
Loic
More information about the bazaar
mailing list