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

[Eugene Sandulenko]

On Sun, 1 Aug 2010 16:51:54 +0300
Ori Avtalion <ori at avtalion.name> wrote:
> My suggestion is for branches that end in tags, and have no commits
> after them. Those branches are effectively "closed", have a permament
> tag pointing at their heads, and so the branch itself can be deleted.
> I'd be surprised if this rule doesn't apply to any of the release
> branch/tag pairs.
OK, sounds reasonable, I just did not consider this possibility. So
you're saying that the commit history at that branch will still stay?
If so, then it is what is needed.

Actually current svn2git does not process tags at all, and those have
to be added manually. Could you demonstrate with git commands how to
achieve what you described?

> If svn tags have been comitted to, and those commits are different
> than the corresponding branches, maybe their heads should also be
> tagged with a special name to signify that.
Logically those commits are the same, but technically in SVN they
differ because of deviations between trunk and branch.

> In general, I think the number of branches in the git repository
> should be kept to a minimum. (Of course, that depends on the decided
> workflow - which hasn't been finalized, if I remember correctly).
I agree, and that would be exactly like this in normal git workflow,
but in SVN those are real stabilization _branches_ which never get
merged back to the trunk. Unless I am missing something.


Eugene