Re: [Zope-dev] Re: CVS: Releases/Zope/lib/python/ZEO - simul.py:1.12.8.2.18.18

2004-01-17 Thread Dieter Maurer
Jeremy Hylton wrote at 2004-1-16 16:53 -0500:
 ...
The branch tag is used for making releases for both ZODB and Zope
releases.  We decided to use the same branch so that we didn't have to
port bug fixes to so many different branches.

One downside of that merge, which we didn't realized until after it was
done, is that you now get a ZEO directory in a Zope checkout on the 2.6
branch.  I think there was email about the discovery at the time

I found this out and was very happy...

That said, I would be (a bit) unhappy when the branch
information were lost for ZEO. My CVS working directory
(which now contains Zope and ZEO from the 2.7 branch)
would probably have some difficulties to update after the
branch information is lost.

It would not be a big problem, though, if I learn that
it happened...

-- 
Dieter

___
Zope-Dev maillist  -  [EMAIL PROTECTED]
http://mail.zope.org/mailman/listinfo/zope-dev
**  No cross posts or HTML encoding!  **
(Related lists - 
 http://mail.zope.org/mailman/listinfo/zope-announce
 http://mail.zope.org/mailman/listinfo/zope )


[Zope-dev] Re: CVS: Releases/Zope/lib/python/ZEO - simul.py:1.12.8.2.18.18

2004-01-16 Thread Tres Seaver
Evan Simpson wrote:
Update of /cvs-repository/Releases/Zope/lib/python/ZEO
In directory cvs.zope.org:/tmp/cvs-serv18593/lib/python/ZEO
Modified Files:
  Tag: Zope-2_6-branch
	simul.py 
Log Message:
Non-Python 2.1-compatible division operator // crept into 2.6 branch.
This is a result of some funny repository fiddling, which somehow got 
both 'ZEO' and 'BDBStorage' onto the 'Zope-2_6-branch'.  I would like to 
remove the branch tag altogether, as neither module is part of the 2.6 
release.  Here is what I would propose doing::

  $ ssh cvs.zope.org
  $ cd /cvs-repository
  $ tar czf /tmp/Zope-just_in_case.tar.gz Zope
  $ ^D
  $ cvs -d :ext:cvs.zope.org:/cvs-repository \
rtag -dB Zope-2_6-branch Zope/lib/python/ZEO
  $ cvs -d :ext:cvs.zope.org:/cvs-repository \
rtag -dB Zope-2_6-branch Zope/lib/python/BDBStorage
Anybody know a reason why we shouldn't do this?  The CVS docs seem to 
consider deleting branch tags a Bad Thing (TM), but I have never seen 
any rationale for it.

Tres.
--
===
Tres Seaver[EMAIL PROTECTED]
Zope Corporation  Zope Dealers   http://www.zope.com
___
Zope-Dev maillist  -  [EMAIL PROTECTED]
http://mail.zope.org/mailman/listinfo/zope-dev
**  No cross posts or HTML encoding!  **
(Related lists - 
http://mail.zope.org/mailman/listinfo/zope-announce
http://mail.zope.org/mailman/listinfo/zope )


Re: [Zope-dev] Re: CVS: Releases/Zope/lib/python/ZEO - simul.py:1.12.8.2.18.18

2004-01-16 Thread Jeremy Hylton
On Fri, 2004-01-16 at 13:58, Tres Seaver wrote:
 This is a result of some funny repository fiddling, which somehow got 
 both 'ZEO' and 'BDBStorage' onto the 'Zope-2_6-branch'.  I would like to 
 remove the branch tag altogether, as neither module is part of the 2.6 
 release.

The branch tag is used for making releases for both ZODB and Zope
releases.  We decided to use the same branch so that we didn't have to
port bug fixes to so many different branches.

One downside of that merge, which we didn't realized until after it was
done, is that you now get a ZEO directory in a Zope checkout on the 2.6
branch.  I think there was email about the discovery at the time, and I
noticed that Brian did not include ZEO in the 2.6.3 releases; so I
assume he's got some mechanism to suppress it from the actual release.

I'd write this down somewhere more permanent if anyone can suggest a
good place.

Jeremy



___
Zope-Dev maillist  -  [EMAIL PROTECTED]
http://mail.zope.org/mailman/listinfo/zope-dev
**  No cross posts or HTML encoding!  **
(Related lists - 
 http://mail.zope.org/mailman/listinfo/zope-announce
 http://mail.zope.org/mailman/listinfo/zope )


Re: [Zope-dev] Re: CVS: Releases/Zope/lib/python/ZEO - simul.py:1.12.8.2.18.18

2004-01-16 Thread Paul Winkler
On Fri, Jan 16, 2004 at 04:53:02PM -0500, Jeremy Hylton wrote:
 One downside of that merge, which we didn't realized until after it was
 done, is that you now get a ZEO directory in a Zope checkout on the 2.6
 branch. 

downside??? I thought that was a good thing!

 I think there was email about the discovery at the time, and I
 noticed that Brian did not include ZEO in the 2.6.3 releases; so I
 assume he's got some mechanism to suppress it from the actual release.

Consider this a request to disable that mechanism ;-)

-- 

Paul Winkler
http://www.slinkp.com
Look! Up in the sky! It's SUPER FRED!
(random hero from isometric.spaceninja.com)

___
Zope-Dev maillist  -  [EMAIL PROTECTED]
http://mail.zope.org/mailman/listinfo/zope-dev
**  No cross posts or HTML encoding!  **
(Related lists - 
 http://mail.zope.org/mailman/listinfo/zope-announce
 http://mail.zope.org/mailman/listinfo/zope )


[Zope-dev] Re: CVS: Releases/Zope/lib/python/ZEO - simul.py:1.12.8.2.18.18

2004-01-16 Thread Tres Seaver
Paul Winkler wrote:
On Fri, Jan 16, 2004 at 04:53:02PM -0500, Jeremy Hylton wrote:

One downside of that merge, which we didn't realized until after it was
done, is that you now get a ZEO directory in a Zope checkout on the 2.6
branch. 


downside??? I thought that was a good thing!


I think there was email about the discovery at the time, and I
noticed that Brian did not include ZEO in the 2.6.3 releases; so I
assume he's got some mechanism to suppress it from the actual release.


Consider this a request to disable that mechanism ;-)
ZEO was a (big) new feature in the 2.7 line;  propagating it into 2.6 
violates our stated release engineering policies, by a *lot* (likewise 
BDBStorage).

Tres.
--
===
Tres Seaver[EMAIL PROTECTED]
Zope Corporation  Zope Dealers   http://www.zope.com
___
Zope-Dev maillist  -  [EMAIL PROTECTED]
http://mail.zope.org/mailman/listinfo/zope-dev
**  No cross posts or HTML encoding!  **
(Related lists - 
http://mail.zope.org/mailman/listinfo/zope-announce
http://mail.zope.org/mailman/listinfo/zope )