[Zope-Checkins] SVN: Zope/trunk/ - Applied patch for

Martijn Faassen faassen at infrae.com
Fri Mar 18 04:40:06 EST 2005

On Thu, Mar 17, 2005 at 09:51:25AM -0500, Tim Peters wrote:
> [Sidnei da Silva]
> > Log message for revision 29524:
> > 
> > ...
> > Changed:
> >  U   Zope/trunk/doc/CHANGES.txt
> >  U   Zope/trunk/lib/python/Lifetime.py
> >  U   Zope/trunk/lib/python/ZEO/runzeo.py
> Please don't check in ZODB/ZEO changes from a wrong project.  If you
> need to change ZODB/ZEO in SVN, check out the appropriate version of
> ZODB and change _that_.  There's a non-trivial chance that changes
> made from a wrong project will simply get lost.
> I realize this can be a PITA.  But _searching_ all the Zope trunks and
> branches for ZODB, ZConfig, and zdaemon changes made from wrong
> places, then merging mountains of patches I didn't apply to begin
> with, is an even bigger PITA -- and sometimes changes do get lost in
> this process.

Would it make sense to use svn:externals, and then add a read-only
link to ZODB using a svn:// url to some tag or branch instead? Then this kind 
of mistake typically wouldn't happen, as you'd only have a writeable
checkout if you checked out ZODB explicitly.

I understood from Jim the 'stitching in by copying' process was to support
doing local changes, but now you seem to want to avoid them, so it gets 
somewhat confusing.



More information about the Zope-Checkins mailing list