Synchronise SVN and bzr

[John Arbash Meinel]

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

Torsten Bronger wrote:
| Hallöchen!
|
| Unfortunately, I've lost the synchronisation of the SVN mirror of my
| main Bazaar trunk.  It started with the message after a push to the
| SVN repo saying "they have diverged", which was technically correct
| but de-facto not.  But now, Bazaar even doesn't find a common
| ancestor anymore.  Whyever.
|
| However, both the Bazaar trunk and the SVN repo contain *exactly*
| the same files.  Is there a way to tell Bazaar that it can safely
| push to and pull from the SVN repo again?
|
| Tschö,
| Torsten.
|

Well, you can do "bzr pull --overwrite" to reset your local Bazaar branch to be
the tip of your SVN branch.

However, if it isn't finding a common ancestor it sounds like you might have a
more serious issue (like the SVN UUID of the repository changing, etc.)

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkgFJ7sACgkQJdeBCYSNAANv6QCgxX/TqLkb996DLGQN2bIjv52a
6eIAoNYXXlD1KjECwPPYumN9+pgVc8W2
=eCZX
-----END PGP SIGNATURE-----