Possible bug in bzr?

[Nicholas Allen]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi,

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.

Cheers,

Nick
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFIbRyr1+i51gqqEGkRAq06AJ9zXhqG0Qwe+/ES6QJLgsrp3d5phQCgjUsU
VWhHRjLJJ+Q7Dk3WdMECOdU=
=h+xo
-----END PGP SIGNATURE-----