Comment 5 for bug 988272

Revision history for this message
Jelmer Vernooij (jelmer) wrote : Re: [Bug 988272] Re: Cannot commit to bound branch

On Thu, Apr 26, 2012 at 08:49:46AM -0000, Tommi Vainikainen wrote:
> Yes, a long time ago I've used older version of bzr-svn to commit some
> versions. There is currently bzr:revision-info, bzr:file-ids, bzr:text-
> revisions, bzr:text-parents, bzr:revision-id:v3-trunk1, and
> bzr:ancestry:v3-trunk1 properties at least.
>
> If I take revnos out of logs and run compare, I can find following
> things:
>
> 1) timestamp of some commits not made with bzr-svn differ by one second,
> including some commits made before first ever commit with bzr-svn
That could be correct, since the commit in bzr is made before it is
pushed to svn.

> 2) master log ("bzr log svn+ssh://...") contains committer with my name
> and email for those commits made with bzr-svn on 2008, and branch nick
> also. Now I remember after reading logs that I really used bzr-svn
> whole summer 2008 until bitten by race condition where one of my commits
> with bzr-svn overwrote commit of my fellow developer...
This is most likely the culprit. I suspect one of the
properties with the revision number will be wrong, and bzr is using
that data to calculate the revision number. If it's a revision
property you should be able to fix it yourself (using the bzr:revno
property).

> 3) For one (and latest) commit made with bzr-svn (I guess) does not
> have svn revno property on local log ("bzr log" locally) at all, but
> remote log contains svn revno property on log.
That's correct too, since the svn revno is only displayed for
revisions that originated in the svn repository. If you create a local
bzr revision and then push that into svn, it originated in bzr, not
svn.

Cheers,

Jelmer