Re: [Zope-dev] Zope-Dev Digest, Vol 83, Issue 6
Tres Seaver wrote:
Christian Theune wrote:
On 06/03/2010 05:05 AM, Tres Seaver wrote:
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
Tres Seaver wrote:
Log message for revision 112936: Add tag 3.4.2
Changed: A zope.applicationcontrol/tags/3.4.2/ I have *no* idea what these messages are about. I was certainly not tagging releases for zope.applicationcontrol today. Worst case: someone has your key?
Not too likely -- more likely some weird bzr-svn bug, as the new tags are showing up in projects where I had been merging bzr branches with janitorial cleanups: they appear immediately after the "real" commit. I have switched over to avoiding 'bzr merge' for now, which seems to have stopped the faux tag creation.
I have a theory, but am not sure how to test it: I think that I recall for both affected projects (zope.applicationcontrol, zope.cachedescriptors), I mistakenly attempted to merge a bzr branch for a completely different project. When the merge failed, it left my local branch apparently clean, but it might have messed up the heuristics / bookkeeping which bzr-svn uses to infer tags for the project.
FWIW,
Tres.
Consider using shared repositories with a fresh branch for each merge: http://wiki.bazaar.canonical.com/SharedRepositoryTutorial Basically, you do something like this: bzr init-repo zope.applicationcontrol --format=rich-root-pack #last I checked, bzr-svn liked this format, you can also --format=svn cd zope.applicationcontrol bzr branch lp:zope.applicationcontrol #bzr looks for .bzr in ., which tells it there is a shared storage What this does is allow you to have multiple local branches of something without wasting full repo storage on each one. This func goes back at least to BitKeeper and may be able to use hardlinks to further reduce storage redundancy, though that can lead to pain, suffering, anger, etc.. Best, J
On Fri, Jun 4, 2010 at 9:06 AM, Justin Ryan <justin.ryan@reliefgarden.org>wrote:
Consider using shared repositories with a fresh branch for each merge:
http://wiki.bazaar.canonical.com/SharedRepositoryTutorial
Basically, you do something like this:
bzr init-repo zope.applicationcontrol --format=rich-root-pack #last I checked, bzr-svn liked this format, you can also --format=svn cd zope.applicationcontrol bzr branch lp:zope.applicationcontrol #bzr looks for .bzr in ., which tells it there is a shared storage
Whups, you'd do something like: bzr branch svn://svn.zope.org/public/zope.applicationcontrolmerge-something-branch This gives you a branch merge-something-branch within your zope.applicationcontrol shared repo.
What this does is allow you to have multiple local branches of something without wasting full repo storage on each one. This func goes back at least to BitKeeper and may be able to use hardlinks to further reduce storage redundancy, though that can lead to pain, suffering, anger, etc..
Best,
J
-----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-----
participants (2)
-
Justin Ryan -
Tres Seaver