[M3devel] CM3 services and Elego support, was: Re: conversion to another version control system

[Olaf Wagner]

Quoting Jay K <jay.krell at cornell.edu>:

> I think I would settle for SVN.
> Though SVN has completely broken branching last I checked, and they   
> acknowledged it.
> SVN also has relatively large dependencies to build from source.

Branching in SVN is OK, merging is still wanting in case of tree
conflicts.

> I would also like a system that doesn't drop files/directories all   
> over the place. Just in the root of a checkout should
> suffice and be ideal. CVS is awful here and I believe SVN is too.

The working copy overhaul expected to be included in SVN 1.7 will
keep all metadata at the root of the checkout in an SQL database.

> I want a system that makes me do *something* before editing a file.
>   Run some command to acknowledge I'm editing it, so it can keep track.

You can use cvs watch and cvs edit for that.
I really wouldn't recommend it though. See also CVSREAD.

> I want a systerm with a command to undo the edits. With CVS I delete  
>  and update. Lame.

cvs unedit

> I'd prefer a system that knows how to use windiff or some other   
> decent gui to show diffs.

tkcvs should work on all platforms. You may want to look at that.
It also show graphical development line trees.

> I've gradually become comfortable with textual diffs.
> But I like gui diffs. Windiff is nice. Some people think it is old   
> and limited, but it is
> much better than textual diffs.
>
> CVS handling of merges and conflicts is also very poor.

Yes. No way to improve that, I'm afraid.

Olaf
-- 
Olaf Wagner -- elego Software Solutions GmbH
                Gustav-Meyer-Allee 25 / Gebäude 12, 13355 Berlin, Germany
phone: +49 30 23 45 86 96  mobile: +49 177 2345 869  fax: +49 30 23 45 86 95
    http://www.elegosoft.com | Geschäftsführer: Olaf Wagner | Sitz: Berlin
Handelregister: Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194