Revisions disappeared on branch
Benjamin Jansen
aogail at w007.org
Tue Jan 20 15:39:50 GMT 2009
Hello all,
We have a bzr branch that has about 350 revisions. Yesterday, we
noticed "bzr log" on our trunk branch now reports that it has only
three revisions: revnos 354, 355, 356. (r354 is the cutoff, previous
revisions don't show up.)
As far as I know, the new "first revision" was created by a user that
used "bzr checkout" of trunk, did some work, then used "bzr commit" to
check in. We have some people using this centralized workflow and
others using a distributed workflow, with their own branches, merging,
etc. I don't think this should matter, but I'm mentioning it just in
case it does; I'm at a loss as to what happened here, so I am
including all the details I have at this point.
Today, I created a new branch off trunk and ran "bzr check". Its
output is below. My questions are: How can I resurrect the branch
history? What actually caused the whole branch history to be replaced,
and how can I prevent it from happening again?
aogail at misaki> bzr branch http://vcs.scm.tripwire.com/bzr/space/trunk/
trunk.borked
aogail at misaki> cd trunk.borked/
aogail at misaki> bzr check
Checking working tree at 'file:///localhome/aogail/development/space/trunk.borked/'
.
Checking repository at 'file:///localhome/aogail/development/space/'.
checked repository <bzrlib.transport.local.LocalTransport url=file:///localhome/aogail/development/space/
> format <RepositoryFormatKnitPack6RichRoot>
487 revisions
23456 file-ids
25753 unique file texts
9576655 repeated file texts
0 unreferenced text versions
Checking branch at 'file:///localhome/aogail/development/space/trunk.borked/'
.
bzr: ERROR: bzrlib.errors.BzrCheckError: Internal check failed: revno
does not match len(mainline) 3 != 356
Traceback (most recent call last):
File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line
893, in run_bzr_catch_errors
return run_bzr(argv)
File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line
839, in run_bzr
ret = run(*run_argv)
File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line
539, in run_argv_aliases
return self.run(**all_cmd_args)
File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line
2513, in run
check_dwim(path, verbose, do_branch=branch, do_repo=repo,
do_tree=tree)
File "/usr/lib/python2.5/site-packages/bzrlib/check.py", line 311,
in check_dwim
check_branch(branch, verbose)
File "/usr/lib/python2.5/site-packages/bzrlib/check.py", line 266,
in check_branch
branch_result = branch.check()
File "/usr/lib/python2.5/site-packages/bzrlib/decorators.py", line
138, in read_locked
result = unbound(self, *args, **kwargs)
File "/usr/lib/python2.5/site-packages/bzrlib/branch.py", line 774,
in check
' %s != %s' % (last_revno, len(real_rev_history)))
BzrCheckError: Internal check failed: revno does not match
len(mainline) 3 != 356
bzr 1.10 on python 2.5.2 (linux2)
arguments: ['/usr/bin/bzr', 'check']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'en_US.UTF-8'
plugins:
avahi /usr/lib/python2.5/site-packages/bzrlib/
plugins/avahi [0.3dev]
bzrtools /usr/lib/python2.5/site-packages/bzrlib/
plugins/bzrtools [1.10]
dbus /usr/lib/python2.5/site-packages/bzrlib/
plugins/dbus [unknown]
gtk /usr/lib/python2.5/site-packages/bzrlib/
plugins/gtk [0.95.0.final.1]
launchpad /usr/lib/python2.5/site-packages/bzrlib/
plugins/launchpad [unknown]
xmloutput /localhome/aogail/.bazaar/plugins/xmloutput
[0.8.1]
*** Bazaar has encountered an internal error.
Please report a bug at https://bugs.launchpad.net/bzr/+filebug
including this traceback, and a description of what you
were doing when the error occurred.
[4] aogail at misaki>
Thanks,
Ben Jansen
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 2328 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090120/79b05271/attachment.bin
More information about the bazaar
mailing list