Re: Repairing erroneous move of setup-200303 branch tag

["Max Bowsher" <maxb at ukf dot net>]

Robert Collins wrote:
> Max Bowsher wrote:
>> The setup-200303 branch tag has been inadvertantly moved, leaving the
>> original branch untagged and inaccessible, and also giving rise to the
>> insanely long version number assigned to the current setup snapshot.
>>
>> I've inspected the RCS files, and can restore the setup-200303 to it's
>> correct location - but I will need to directly edit the RCS files.
>> (Obviously I will do a test run on a local copy of the repository first).
>>
>> Advantages:
>> * Repository would be less confusing to someone inspecting it at a later
>> date.
>> * We can have a less silly version number for our next release setup.
>> * Simple tidyness.
>>
>> Disadvantages:
>> * I'll need to lock the relevant directories (setup and libgetopt++) for
>> about 15 minutes
>>
>>
>> Comments?
>
> Go for it. I didn't realise CVS was so broken.

I will prepare a Perl script tonight, and do the fix tomorrow.
Commits to any branch may continue unhindered in the intervening time.

Current branch structure:

TRUNK
--> (name removed - used to be and will be again setup-200303)
    --> setup-200303-troubleshooting
        --> (spurious extra branch - currently called setup-200303)

I will rename the spurious extra third-level branch to
setup-200303-uselessbranch as a temporary measure.

I request cvsadmin membership so I can continue the cleanup from this stage,
by erasing a revision from ChangeLog (the only revision committed in the
uselessbranch), after which I can remove the uselessbranch tag without
leaving debris behind.

I will then complete what Robert presumably meant to do before: merge the
troubleshooting branch changes into the original (and at this point,
reinstated) setup-200303 branch.

I will then prepare a 2.340.2.4 snapshot, which will be identical code to
2.340.2.3.2.10.2.1, but with a saner version number.


Max.