[Zope] Concurrent development

[Paul Everitt]

Hello Richard.  This is a timely subject, as some of us here at ZC have 
been ruminating in depth lately on proper versioning in Zope.  Though I 
can't promise exactly the time, chances are decent that we'll have 
something in the fishbowl for proposal in the next week or so.

As for merging, that's not likely to be something we do right out of the 
gate.  You can approximate it currently by visiting the history tab of 
your object, and using non-Zope tools (such as Emacs's ediff) to compare 
and merge two buffers.  But yes, this is klunky (especially since this 
history doesn't seem to be FTP or DAV enabled).

Here's something that *is* possible right now, and works pretty well. 
Just write your content on the filesystem, checked into CVS.  The use 
sitecopy (a DAV tool) to do a two-way mirror.

--Paul

Richard Wesley wrote:

> Hi Zopers,
> 
> I have been looking into Zope of late, partly because I have a web site 
> I'd like to build as a demo, and partly because I felt I should just 
> know some kind of web app tool, and Zope came highly recommended.
> 
> After playing with it for a bit, I have become nervous about the 
> revision control aspects.  Conflicts are pretty much resolved silently 
> in favor of the last person to make a change.  There is some sort of 
> branch scheme, but my initial impression of it was that it was pretty 
> also suffered from the lack of merge capabilities.
> 
> Given that CVS is used for the actual development of Zope, this 
> surprises me.  Have I missed something?  How do teams work with Zope 
> without stepping on each other's toes?  Is this a problem in practice?
> 
> TIA,
> Sincerely,
> 
> Richard Wesley
> Co-President, Electric Fish, Inc.
> <http://www.electricfish.com/>
> +1-206-634-2926 (v)
> +1-206-634-2921 (f)
> 
> _______________________________________________
> Zope maillist  -  Zope@zope.org
> http://lists.zope.org/mailman/listinfo/zope
> **   No cross posts or HTML encoding!  **
> (Related lists - http://lists.zope.org/mailman/listinfo/zope-announce
> http://lists.zope.org/mailman/listinfo/zope-dev )