bzr-svn and inconsistent parents...
John Szakmeister
john at szakmeister.net
Sun May 30 12:36:17 BST 2010
Hey Jelmer,
I was converting one of my personal repositories this morning and ran
into something interesting. First, I ended up with a bunch of
inconsistent parents... which I don't understand. There are no ghosts
in the repository, so there should be any issue with the parents. So
I checked it out a little more. Turns out I have a bunch of revs like
the following:
* 115 at e61a31aa-3459-45aa-b720-13e5e9e6849e:trunk%2Fmedia%2Fcss%2Fhome.css
version svn-v4:e61a31aa-3459-45aa-b720-13e5e9e6849e:trunk:122 has
parents ('svn-v4:e61a31aa-3459-45aa-b720-13e5e9e6849e:trunk:121',
'svn-v4:e61a31aa-3459-45aa-b720-13e5e9e6849e:trunk:121') but should
have ('svn-v4:e61a31aa-3459-45aa-b720-13e5e9e6849e:trunk:121',)
For whatever reason, the immediate parent is being specified twice.
'bzr reconcile' doesn't fix it either. :-( FWIW, log looks fine:
------------------------------------------------------------
revno: 121
revision-id: svn-v4:e61a31aa-3459-45aa-b720-13e5e9e6849e:trunk:121
parent: svn-v4:e61a31aa-3459-45aa-b720-13e5e9e6849e:trunk:120
svn revno: 121 (on /trunk)
committer: jszakmeister
timestamp: Sun 2008-05-25 14:06:15 +0000
message:
* media/css/home.css [M.]
* media/css/resume.css [M.]
Style links.
modified:
media/css/home.css
115 at e61a31aa-3459-45aa-b720-13e5e9e6849e:trunk%2Fmedia%2Fcss%2Fhome.css
media/css/resume.css
117 at e61a31aa-3459-45aa-b720-13e5e9e6849e:trunk%2Fmedia%2Fcss%2Fresume.css
Any clues on how to fix this?
-John
More information about the bazaar
mailing list