[Adium-devl] Let's switch to a DVCS

[Zachary West]

On Wed, Apr 15, 2009 at 11:12, Peter Hosey <boredzo at adiumx.com> wrote:
> If you think merging *within* Subversion is painful, think about merging
> *into* Subversion. ;)
>
> Basically, every merge becomes hg diff | patch -p1 && svn ci. Theoretically
> easy, but I still wouldn't want to do it unless necessary (i.e., a need for
> 1.3.5 arises after we move to hg).

We can't really merge into 1.3 these days, anyway. Almost all trunk
code is in Obj-C2, making merging ridiculously too much work for
anything. Hence my hate of 1.3.x.


> Full history includes branches. Omitting anything is not full history.
>
> Various tools have choked on it. Last I saw, though, hg convert was able to
> go all the way in several runs. Again, that's just my memory and I might
> have forgotten a problem.
>
> I'm running it right now on my other machine, so we'll see what happens.
>
> It's 1.9 GiB.

The mercurial repository? I know svn is about that big, but if we're
going to have to download that much to clone, I don't think we can
manage.

> Not sure where we would put it. Also, would we have to punch it in the face
> every night, too?
>
> (Strangely, I didn't have to do that last night. It seemed as though it
> stayed up. Maybe it was just somebody hovering over their enter key,
> though.)

I do it in the morning (and did this morning) usually. Heh.

Zac