[Webmacro-devel] CVS reorganisation, branches and git (was Re: Next steps towards a WebMacro 2.2)

[Guy B. K. <gu...@wa...>]

On 25 Feb 2010, at 19:36, Guy Bolton King wrote:

> 
> On 21 Feb 2010, at 16:02, Tim Pizey wrote:
>> 
>> The CVS tree has been reorganised
> 
> Hi all: the reorganised webmacro tree didn't appear to have a tag marking the point of reorganisation.  I've added a webmacro-2_2-repo-layout-change tag on 2010-02-20 23:30:07, just for the record.

Hi Tim: earlier you made an "eek" noise when CVS branches were suggested.  A short stint of merging some feature branches back to HEAD last week reminded me of the general flakiness of doing this (even with tool support).  However, we still have it in mind to do some experimentation, and while that isn't a promise/threat we don't want to mess up the single CVS branch at sourceforge with possibly disruptive changes.

Given this, I've updated the webmacro repo at github (http://github.com/guyboltonking/webmacro) such that it now tracks the sourceforge CVS on its CVS-2.2/master branch.  This repo contains all the history from CVS, and also tracks the moves from the reorganisation done at the end CVS-2.1.  It doesn't show any merges from the early branches: this is because detecting these would have been too much trouble.

If we get around to making any changes, we'll make them on the master branch (or feature branches) in that repo, and we'll offer them back to the main CVS repo.  If approved for inclusion, we can (hopefully easily) commit them to CVS using git's cvsexportcommit command.

Regards,

Guy.