Bazaar 0.90.0 problem merging back to Subversion

[Jelmer Vernooij]

On Tue, Jan 29, 2008 at 05:39:59PM +0000, Russel Winder wrote:
> I am using Ubuntu Gutsy Gibbon and hence Bazaar 0.90.0.  I have a Bazaar
> checkout of a Subversion repository, I have bzr-svn installed
> (obviously :-).  To date things have been working fine.  The repository
> is small and so no problems with speed etc.  However this afternoon, I
> used a local commit as I have done in the past when not online.  Online
> again I did the bzr update to get the local commits scheduled for
> committing to the Subversion repository being mirrored but....

> |> bzr commit -m "Committing material to Subversion that was committed
> locally with Bazaar."
> modified and renamed
> ITA_ITD_Articles/Draft/Russel/theSoftwareDevelopmentProblem.doc =>
> ITA_ITD_Articles/Draft/Russel/threadsAreTheProblemNotTheSolution.doc
> added
> ITA_ITD_Articles/Draft/Russel/willFunctionalProgrammingHaveARenaissance.doc
> deleted
> ITA_ITD_Articles/Draft/Russel/multicoreAwareAndThreads.doc                                                                                
> bzr: ERROR: sqlite3.IntegrityError: columns max_revnum, min_revnum,
> path, scheme are not
> unique                                                   

> Traceback (most recent call last):
>   File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 817,
> in run_bzr_catch_errors
>     return run_bzr(argv)
>   File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 779,
> in run_bzr
>     ret = run(*run_argv)
>   File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 477,
> in run_argv_aliases
>     return self.run(**all_cmd_args)
>   File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 2283,
> in run
>     reporter=reporter, revprops=properties)
>   File "/usr/lib/python2.5/site-packages/bzrlib/decorators.py", line
> 165, in write_locked
>     return unbound(self, *args, **kwargs)
>   File "/usr/lib/python2.5/site-packages/bzrlib/workingtree_4.py", line
> 246, in commit
>     result = WorkingTree3.commit(self, message, revprops, *args,
> **kwargs)
>   File "/usr/lib/python2.5/site-packages/bzrlib/decorators.py", line
> 165, in write_locked
>     return unbound(self, *args, **kwargs)
>   File "/usr/lib/python2.5/site-packages/bzrlib/mutabletree.py", line
> 207, in commit
>     revprops=revprops, *args, **kwargs)
>   File "/usr/lib/python2.5/site-packages/bzrlib/commit.py", line 328, in
> commit
>     revision_id=self.rev_id)
>   File "/usr/lib/python2.5/site-packages/bzrlib/repository.py", line
> 442, in fetch
>     return inter.fetch(revision_id=revision_id, pb=pb)
>   File "/usr/lib/python2.5/site-packages/bzrlib/plugins/svn/commit.py",
> line 787, in fetch
>     self.copy_content(revision_id=revision_id, pb=pb)
>   File "/usr/lib/python2.5/site-packages/bzrlib/plugins/svn/commit.py",
> line 743, in copy_content
>     while not self.target.has_revision(revision_id):
>   File
> "/usr/lib/python2.5/site-packages/bzrlib/plugins/svn/repository.py",
> line 453, in has_revision
>     (path, revnum, _) = self.lookup_revision_id(revision_id)
>   File
> "/usr/lib/python2.5/site-packages/bzrlib/plugins/svn/repository.py",
> line 749, in lookup_revision_id
>     str(scheme), entry_revno)
>   File "/usr/lib/python2.5/site-packages/bzrlib/plugins/svn/revids.py",
> line 131, in insert_revid
>     (revid, branch, min_revnum, max_revnum, scheme))
> IntegrityError: columns max_revnum, min_revnum, path, scheme are not
> unique

> bzr 0.90.0 on python 2.5.1.final.0 (linux2)
> arguments: ['/usr/bin/bzr', 'commit', '-m', 'Committing material to
> Subversion that was committed locally with Bazaar.']

> ** please send this report to bazaar at lists.ubuntu.com

> So having sent the report to the list, I need to know if there is anyway
> of getting a merge or whether I have to manually repair things with
> Subversion.

This is a bug that has been fixed in newer versions of bzr-svn.

If you have 0.4.2 or later installed, remove ~/.bazaar/svn-cache and try again.
0.4.7 should work even without removnig ~/.bazaar/svn-cache.

Cheers,

Jelmer
-- 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 307 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080201/9e8f8f9b/attachment.pgp