is bzr-svn working? which version?

[Jelmer Vernooij]

Am Samstag, den 15.09.2007, 00:11 +0200 schrieb Jelmer Vernooij:
> Am Freitag, den 14.09.2007, 09:35 +0200 schrieb Balazs Ree:
> > % bzr missing
> > Using last location: svn+ssh://.../
> > You have 1 extra revision(s):
> > ------------------------------------------------------------
> > revno: 33
> > committer: Balazs Ree <ree at greenfinity.hu>
> > branch nick: bzr-repo
> > timestamp: Fri 2007-09-14 08:57:14 +0200
> > message:
> >   Merge from svn
> > 
> > % bzr push svn+ssh://svn.thedailyreel.com/home/zope/
> > svn/tdr.jabberbot/branches/test1
> > bzr: ERROR: These branches have diverged.  Try using "merge" and then 
> > "push".
> > 
> > % bzr merge  Merging from remembered location svn
> > +ssh://svn.thedailyreel.com/home/zope/svn/tdr.jabberbot/branches/test1
> > Nothing to do.
> > 
> > And game over. The branch is in a useless state now.
> > 
> > What is the problem? I am using bzr 0.90~rc1-1 with bzr-svn from http://
> > people.samba.org/bzr/jelmer/bzr-svn/0.4/
> > 
> > I tried with more versions, and I always have this. I don't suppose this 
> > is a bug, either it should be a problem in the way I use it, or I should 
> > use a different version? Any help is appreciated!
> Yes, this is a bug (albeit a corner case one). Generally, in this case, you would not merge the Subversion branch but pull from it, like you would with a Bazaar branch, since the local branch doesn't have any extra revisions not present in the remote one.
> 
> Nevertheless, this is a bug. I've reproduced it here and will fix it for
> 0.4.3.
I've just committed a fix to the 0.4 branch for this bug.

Cheers,

Jelmer
-- 
Jelmer Vernooij <jelmer at samba.org> - http://samba.org/~jelmer/
Jabber: jelmer at jabber.fsfe.org
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 307 bytes
Desc: Dies ist ein digital signierter Nachrichtenteil
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070915/0d3bfb88/attachment.pgp