svn revision "hidden" by bzr revision

[Mike C. Fletcher]

We have an svn 1.4 repository (unfortunately proprietary) against which I am running bzr-svn:

   bzr-repo
      trunk -- bzr co of the trunk of the repository
      working -- bzr branch of trunk

my standard working pattern is to edit in working, then bzr up in trunk and rebase working on trunk. Then bzr merge working into trunk and bzr commit. This generally works correctly. However, we are now seeing an upstream (svn-created) revision (generated by a merge of an svn branch) which did *not* show up in the bzr repository. When I do a bzr log svn:revno path-to-repo I can see the revision. However, the bzr revno on both this revision and a revision which was introduced by me using the above pattern are the same:

------------------------------------------------------------
revno: 4270 [merge]
svn revno: 12301 (on /zinger/trunk)
committer: Mike C. Fletcher <mcfletch@dalek>
branch nick: zinger/trunk
timestamp: Mon 2010-09-13 13:39:16 -0400
message:
  ...
------------------------------------------------------------
revno: 4270
svn revno: 12300 (on /zinger/trunk)
committer: ...
timestamp: Mon 2010-09-13 16:49:38 +0000
message:
  ...

bzr check crashes on the repository. bzr log on the trunk checkout does not show the revision, and all operations which reference -r svn:12300 fail saying the revision is not present.

It is *possible* that the rebase operation was missed in the normal data-flow, but in that case bzr-svn should have rejected the merge-commit as being based on an old revision.

bzr-svn v 1.0.2-2
bzr 2.1.1-1
Ubuntu Lucid

[Philip Peitsch (philip-peitsch)]

The symptoms sound rather like https://bugs.launchpad.net/bzr-svn/+bug/515850. Can you double check the timestamps on the commits in question? If they are very close together (within a few minutes of each other), that linked bug is likely the issue. I am not sure if there is an easy way to fix it however...

[Philip Peitsch (philip-peitsch)]

Ahh... scratch that. I noticed the checkin's are over an hour apart... interesting...

[Jelmer Vernooij (jelmer)]

Just to check - you're running bzr-svn 1.0.2 which is fairly old. If it's not too hard to upgrade bzr-svn it'd be interesting to know if this issue still occurs when branching this svn branch using a newer version of bzr-svn (1.0.4).

Can you check the contents of the bzr:revision-info file property on the branch root for these two revsions and paste them here (stripping out any proprietary information that should be kept private).