Possible bug in bzr?

[Jelmer Vernooij]

Am Donnerstag, den 03.07.2008, 20:38 +0200 schrieb Nicholas Allen:
> I have a working copy of bzr-svn that I pull into every now and then to
> keep it up to date. I haven't done so for about a month and just tried
> to do so now. I have never committed to my branch of bzr-svn but bzr
> gives me the following error:
> 
> Using saved location: http://people.samba.org/bzr/jelmer/bzr-svn/trunk/
> bzr: ERROR: These branches have diverged. Use the merge command to
> reconcile them.
> 
> I don't know how they could have diverged if I have not worked on my
> local copy.
I suspect I may have used "push --overwrite" on that branch. 

Also, please note that the trunk branch of bzr-svn isn't updated very
often - all development happens in the 0.4 branch these days.

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: 315 bytes
Desc: Dies ist ein digital signierter Nachrichtenteil
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080703/046e1018/attachment.pgp