[Adium-devl] Version control

[Augie Fackler]

Ok, so I read through this thread, and this is a quick-and-dirty meta- 
reply.

1) Subversion is *really* mature at this point.
2) We like having contributors - I know for a fact a lot of newbies  
will be scared off by monotone. Heck, if we go that route I'll  
probably give up on working on Adium because I can't figure the  
stupid thing out. It hasn't ever done anything but segfault for me.
3) Merging in Subversion will Not Suck in 1.5 - there's finally merge  
tracking, and we'll be able to do whatever bad-practice merges we  
want without screwing ourselves. Ideally, when 1.5 hits we should  
just upgrade right away.
4) Initial checkout size: when you pull down a working copy for svn,  
you need to get O(number of current files) data. When you pull a DVCS  
repo for the first time, you pull down O(number of changes) amount of  
data - when I created a mercurial import of *just* trunk, it was a  
few hundred megs.
5) git-svn: Most of you probably know how much I detest git and its  
design, but if you really want DVCS features against a Subversion  
server, you can do it with git-svn. I'd really like to see this  
investigated before we decide to jump ship to a DVCS tool that will  
be more confusing.

If we were to go DVCS, I'd prefer Mercurial - it seems to be the most  
sane of the ones I've tried. My second choice would be git, because  
there will soon be ways to use git and Mercurial with each other (now  
that libgit is around from SoC).

Those are my 4 cents - I'll try to catch up with this thread later  
today in my afternoon class lull.

Peace,
Augie

On Oct 8, 2007, at 8:07 AM, Joshua Lock wrote:

> On 08/10/2007, Chris Forsythe <chris at adiumx.com> wrote:
>>>> Over the summer, I had to use darcs to fetch another project's
>>>> repository (right now, every project seems to have their own DVCS
>>>> program). This was just as simple to use as svn, and just as fast.
>>>> This was read-only though, I don't know how good the developer side
>>>> of it is.
>>>
>>> Is darcs fast enough?
>>>
>>
>> Let's find out. Do you have time to make a feature grid/suckage level
>> grid against all the popular vcs solution? Even the non-distributed
>> kind?
>
> Darcs has a well documented bug[1][2][3] to do with conflict
> resolution while merging in large repositories.
> It's being worked on but AFAIK it's not fixed yet, which is a shame.
>
> Josh
>
> 1. http://en.wikipedia.org/wiki/Darcs#Bugs
> 2. http://lists.osuosl.org/pipermail/darcs-users/2007-August/ 
> 011226.html
> 3. http://wiki.darcs.net/DarcsWiki/ConflictMisery?highlight=% 
> 28conflict%29
>
> ---
> Joshua Lock
> incandescant at gmail.com
>
> _______________________________________________
> Adium-devl mailing list
> Adium-devl at adiumx.com
> http://adiumx.com/mailman/listinfo/adium-devl_adiumx.com