Version number on trunk

[Lillian Angel]

Andrew Haley wrote:
> Lillian Angel wrote:
>   
>> Andrew Haley wrote:
>>     
>>> Lillian Angel wrote:
>>>  
>>>       
>>>> Andrew Haley wrote:
>>>>    
>>>>         
>>>>> I've bumped the branch to 1.6, and now want to bump the trunk.  I think
>>>>> the version on the trunk should be something like "1.7pre", since it's
>>>>> after 1.6 branched but before 1.7 branched.
>>>>>       
>>>>>           
>>>> I agree with this.
>>>>
>>>> Question: When 1.7 is branched, is the repo tagged with 1.7 or 1.8pre?
>>>> Or is it tagged with 1.7 right before the new 1.7 branch is created?
>>>>     
>>>>         
>>> The trunk should be version 1.8pre immediately after 1.7 branches.
>>>       
>> ok, so the repo will always be tagged with IcedTea6-X.Ypre
>>     
>
> The trunk repo, yes.
>
> Unfortunately, I can't tag the 1.6 branchpoint.  I've done so in my local
> repo, but when I push the change,
>
>   $ hg push
> pushing to ssh://icedtea.classpath.org/hg/icedtea6
> searching for changes
> remote: adding changesets
> remote: adding manifests
> remote: adding file changes
> remote: added 1 changesets with 1 changes to 1 files
> remote: error: incoming.notify hook raised an exception: cannot concatenate 'str' and 'NoneType' objects
>
> I guess this is a bug on the server side.


As far as I know, the changes still go through with this error.
http://icedtea.classpath.org/hg/icedtea6/

Lillian