Log on file inconsistent revno with log on branch (also "revno does not match len(mainline)")
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Confirmed
|
Medium
|
Unassigned | ||
Breezy |
Triaged
|
Medium
|
Unassigned |
Bug Description
I have a branch where 'bzr log FILE' reports that FILE was changed in revision 21, but 'bzr log -r 21' shows a different commit message!
Bazaar version:
Bazaar (bzr) 1.13dev
from bzr checkout /home/cdb/
revision: 4086
revid: <email address hidden>
branch nick: bzr.dev
Here's the deal.
Log inconsistent
=======
First, I log all branch revisions. I can do this many ways, and I get the same result. The file 'vcs_log_data.tex' appears to have been modified in revision 22.
$ bzr log -r 21..22 --show-ids -v
-------
revno: 22
revision-id: <email address hidden>
parent: <email address hidden>
committer: Colin D Bennett <email address hidden>
branch nick: final_report
timestamp: Thu 2009-03-05 21:51:00 -0800
message:
Log edit: Attribute primary authorship of arc algorithm fix to Eric.
modified:
Documentation
-------
revno: 21
revision-id: <email address hidden>
parent: <email address hidden>
committer: Colin D Bennett <email address hidden>
branch nick: final_report
timestamp: Thu 2009-03-05 21:36:18 -0800
message:
Updated directory tree listing from trunk.
Listing of directory tree of revision:
revid:<email address hidden>
modified:
Documentation
Next, I try to log just that file. However, it appears to have been modified in revision 21 instead!
$ bzr log Documentation/
-------
revno: 21
revision-id: <email address hidden>
parent: <email address hidden>
committer: Colin D Bennett <email address hidden>
branch nick: final_report
timestamp: Thu 2009-03-05 21:51:00 -0800
message:
Log edit: Attribute primary authorship of arc algorithm fix to Eric.
modified:
Documentation
-------
revno: 19
revision-id: <email address hidden>
parent: <email address hidden>
committer: Colin D Bennett <email address hidden>
branch nick: final_report
timestamp: Thu 2009-03-05 15:58:05 -0800
message:
Checked in log after merging version 3.0 into trunk.
added:
Documentation
modified:
Documentation
$ bzr info
Repository branch (format: 1.9-rich-root or development-
Location:
shared repository: /home/cdb/
repository branch: .
Related branches:
parent branch: /home/cdb/
Note that 'bzr diff -c 21 Documentation/
On the other hand, 'bzr diff -c 22 Documentation/
So the log on the whole branch is correct, but 'log FILE' is wrong.
I've been using bzr-svn in the repository, but this branch is only local to my Bazaar repo. I get the same results with --no-plugins.
Check crashes
=======
I just tried 'bzr check' on the branch, and it crashed:
cdb@gamma ~/school/
No working tree found at specified location.
Checking repository at 'file:/
checked repository <bzrlib.
166 revisions
4023 file-ids
4063 unique file texts
47754 repeated file texts
0 unreferenced text versions
Checking branch at 'file:/
bzr: ERROR: bzrlib.
Traceback (most recent call last):
File "/home/
return run_bzr(argv)
File "/home/
ret = run(*run_argv)
File "/home/
return self.run(
File "/home/
check_
File "/home/
check_
File "/home/
branch_result = branch.check()
File "/home/
result = unbound(self, *args, **kwargs)
File "/home/
' %s != %s' % (last_revno, len(real_
BzrCheckError: Internal check failed: revno does not match len(mainline) 24 != 23
bzr 1.13dev on python 2.5.4 (linux2)
arguments: ['/home/
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'en_US.utf8'
plugins:
automv /home/cdb/
bzrtools /home/cdb/
extmerge /home/cdb/
gtk /home/cdb/
launchpad /home/cdb/
loom /home/cdb/
mirror /home/cdb/
netrc_
qbzr /home/cdb/
repo_push /home/cdb/
svn /home/cdb/
xmloutput /home/cdb/
*** Bazaar has encountered an internal error.
Please report a bug at https:/
including this traceback, and a description of what you
were doing when the error occurred.
cdb@gamma ~/school/
Changed in bzr: | |
status: | New → Confirmed |
importance: | Undecided → Medium |
tags: | added: log |
tags: | added: check-for-breezy |
Changed in brz: | |
status: | New → Triaged |
importance: | Undecided → Medium |
tags: | removed: check-for-breezy |
After running 'bzr reconcile' it seems to be fixed.
cdb@gamma ~/school/ cscd494/ work/final_ report $ bzr reconcile /home/cdb/ school/ cscd494/ repo/final_ report/ //home/ cdb/school/ cscd494/ work/final_ report/ "
Reconciling branch file://
Fixing last revision info 25 => 24
bzr: ERROR: No repository present: "file:/
After this, running a 'log' on the branch shows revision 21 as being "Log edit: Attribute primary authorship...", and now things are consistent.