-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Justin Ryan wrote:
Consider using shared repositories with a fresh branch for each merge:
I already was. ;) In my shared repository, I first checked out the SVN trunk as a "bound" branch using bzr-svn: $ cd projects/Zope/ # this is the shared repo $ bzr co $ZSVN/zope.applicationcontrol/trunk \ svn/zope.applicationcontrol $ bzr branch svn/zope.applicationcontrol $ cd zope.applicationcontrol Then, I went to merge your branch, which should have been: $ bzr merge lp:~justizin/zope.applicationcontrol/id_marker_lp_569541 but instead, due to a mixup in my cut-and-paste, I did: $ bzr merge p:~justizin/zope.annotation/id_marker_lp_569541 That merge failed, but apparently not before tricking bzr-svn into recording a bunch of new tags from the "foreign" branch. I then did the merge correctly: $ bzr merge lp:~justizin/zope.applicationcontrol/id_marker_lp_569541 $ bzr commit -m "Remove CVS-era Id fossils." but when I pushed the committed changes back to the parent, $ bzr push :parent bzr-svn pushed along the bogus tags. jelmer has confirmed that this is a bug (in bzr, not bzr-svn): https://bugs.launchpad.net/bzr/+bug/589514 Tres. - -- =================================================================== Tres Seaver +1 540-429-0999 tseaver@palladion.com Palladion Software "Excellence by Design" http://palladion.com -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iEYEARECAAYFAkwJPtUACgkQ+gerLs4ltQ5jjwCgtZvsV6c/HlIMNSg/lCcmUtDy bS4An2ry4FJ6olruYSZL0DIM5NCh+AY2 =fbTk -----END PGP SIGNATURE-----