[Scummvm-devel] Switching to Git (was Re: Broken Sword 2.5)

[yotam barnoy]

On Sun, Aug 1, 2010 at 4:22 PM, Eugene Sandulenko <sev at scummvm.org> wrote:
> On Sun, 1 Aug 2010 15:40:36 +0300
> Ori Avtalion <ori at avtalion.name> wrote:
>> These points may be relevant to all repositories, but are specific to
>> ScummVM and Tools where there is "real" parallel development:
>>
>> 1. Why keep the old branches around as git branches? The tags already
>> point to their relevant heads, and I think only development lines that
>> are being actively comitted to should be git branches. That way it
>> will be more obvious when a development line is "closed".
> There were commits to those branches, what to do with them?

Are we planning on having a development and a stable branch? If so, we
can combine all the release branches + tags together into the stable
branch. ie. pull in branch 0.1.0 + all commits to branch 0.1.0 and
merge it back into stable, pull in tag 0.1.0 + all commits to 0.1.0,
rebase them and merge to stable, pull in branch 0.2.0 + all commits to
the branch etc. It wouldn't be a perfect history of the stable branch
but it would be pretty good.

Yotam