On Fri, 2005-10-28 at 10:12 -0400, Tim Peters wrote:
> Ah, it's the properties on lib/python that are screwing us here!  Chris, throw
>     svn revert lib/python
> into the mix too.  That got me unstuck.  The problem is that both Jim
> and I (at least) changed the set of externals listed in lib/python,
> and SVN absolutely sucks at merging property changes.  The "revert"
> above gets you back to the externals Zope trunk actually uses today. 
> That's vital because Zope trunk stitches in "zope" in an entirely
> different way now.  Reverting also stitches in a version of ZODB we
> don't want to use, but after reverting you can do
>     svn propedit svn:externals lib/python
> to put back "the right" version of ZODB for your branch (s/3.4.2/3.6.0b1/g).

Woo hoo!  As always, you are my hero, Tim.  That worked great.  And it
as a bonus Zope even *starts* after changing the properties and running
svn up.

- C

Zope-Dev maillist  -  Zope-Dev@zope.org
**  No cross posts or HTML encoding!  **
(Related lists - 
 http://mail.zope.org/mailman/listinfo/zope )

Reply via email to