Re: AW: Parallell Development / Switching to GIT

From: Peter Harris <git@peter.is-a-geek.org>
Date: Jun 29, 2009, 16:37 UTC
Message-ID: <eaa105840906290937h14868eb8v7928951876f7e8f1@mail.gmail.com>
In-Reply-To: <4A487CCD.1040406@op5.se>

On Mon, Jun 29, 2009 at 4:35 AM, Andreas Ericsson wrote:

> Patrick Neuner - Futureweb.at wrote:
>> But having 2 completly different repos would be another solution, but
>> I kinda wonder that mergin would work correctly this way (if both
>> sides have changes).

Show 6 quoted lines

> I'd advise you to clone the linux kernel and inspecting its history
> using gitk. Every merge-commit you see which has a line saying something
> like "merge foo bar frotz of git://example.com/path/to/repo.git" is a
> merge with branches from different repositories. I wouldn't be the least
> surprised if you find more than 5000 such merges in the linux kernel
> history.

You got me curious, so I looked:

~/linux-2.6$ git log | grep -c "Merge.*git:" 4431

Not quite 5000, but still an average of roughly 2.88 such merges per day, every single day, since the kernel was moved to git in 2005.

Peter Harris