[Adium-devl] VCS + SVN 1.5

[Augie Fackler]

On Dec 25, 2007, at 11:26 PM, Peter Hosey wrote:

> <snip various VCSes discussed>

What we need to do is come up with a list of wants and needs (as far  
as I can see - otherwise this is going to be pure chaos).

Needs:
*) Versioning
*) Branching
*) Easy (no manual tracking) merging between branches
*) Simple UI
*) Trac integration (is this really a need?)

Wants:
*) Low initial-pull overhead (see Pidgin's "download a sqlite db then  
run pull" issue)
*) Fast
*) Good way to share patches including changes to binary files.

Did I miss anything?

Candidates:
darcs, git, Monotone, Mercurial, Subversion+svnmerge.py, sv[1]

Offhand, I see the following overall negatives:
darcs: Different. Written in Haskell.
git: UI is (historically) bad. Backend is an engineering nightmare.  
Trac integration?
Monotone: Somewhat unfriendly. Slow.
Mercurial: Serving could be hard. Large on-disk history if we bring in  
the entire history.
Subversion+svnmerge.py: Fundamentally a little weird - merge tracking  
happens in svn properties.
sv: I don't know *anything* about this, but it looks like it could be  
promising.

Should this go in a wiki page or something?

For what it's worth, I'm willing to attempt using svn+svnmerge.py on a  
feature branch for the bundles-for-filetransfers feature.

[1] http://code.google.com/p/sv-subversion/