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

[Felipe Contreras]

On Wed, Apr 15, 2009 at 8:55 PM, Evan Schoenberg <evan at adiumx.com> wrote:
> On Apr 15, 2009, at 11:17 AM, Zachary West <zacwest at gmail.com> wrote:
>
>> 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.
>
> Indeed. The plan even with pure subversion is to eschew trunk to 1.3 merging
> as much as possible anyways; the branch will remain live only for truly
> critical fixes for our 10.4 users.
>
>
>>> 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.
>
> That's crazy big. Are we going to end up at those levels with any DVCS no
> matter what over time given the libpurple binary? That might require
> periodic pruning... Or is there a way to distribute only history from one
> point forward?

I'm pretty sure the size would be smaller in git.

Also, git has support for graft-points so you can say, OK, the history
before point X goes into the "foo" repository, and after that we use
"bar" repository. People that don't care about ancient history can
just use "bar" and people that care can have the whole history ("foo"
+ "bar") using a graft-point that joins both of them.

-- 
Felipe Contreras