[Adium-devl] Throwing the switch

Peter Hosey boredzo at adiumx.com
Thu May 1 10:51:04 UTC 2008


On May 01, 2008, at 03:16:28, Evan Schoenberg wrote:
> GSoC is the addition of 3 students to the programming team.  We put  
> a lot of effort into making their experience smooth and educational  
> and so on, but the focus of Adium should not shift to center around  
> them.  They can adjust and learn to a reasonable but changing  
> environment.

But don't forget that we, the developers, would also have to deal  
with the switch at the same time as trying to mentor the students.

I think we can put it off until after GSoC. Merging using Subversion  
isn't THAT bad.

> I'd appreciate a little more detail about where exactly the import  
> from subversion fails.

It doesn't correctly import our branches and tags. As I told Patrick  
Mézard of the hg team:

> Unfortunately, the resulting repository is not complete. A large  
> number of tags are missing.
>
>> hg tags | cut -f 1 -d ' ' | sort > hg_tags.out
>> ___
>> svn ls ../adium/tags | sed -e 's/\///' | sort > svn_tags.out
>> ___
>> diff -u svn_tags.out hg_tags.out            %~/Projects/ 
>> @otherpeoplesprojects/adium-hg(0)
>> --- svn_tags.out        2008-04-09 23:12:36.000000000 -0700
>> +++ hg_tags.out 2008-04-09 23:10:12.000000000 -0700
>> @@ -11,24 +11,8 @@
>>  AdiumX_0-61
>>  AdiumX_0-62
>>  AdiumX_0-63
>> -AdiumX_0-70
>> -AdiumX_0.80
>> -AdiumX_0.81
>> -AdiumX_0.82
>> -AdiumX_0.83
>> -AdiumX_0.84
>> -AdiumX_0.85
>> -AdiumX_0.86
>> -AdiumX_0.87
>> -AdiumX_0.88
>> -AdiumX_0.89
>> -AdiumX_0.89.1
>> -AdiumX_1.0
>>  AdiumX_1.0.1
>> -AdiumX_1.0.2
>> -AdiumX_1.0.3
>>  AdiumX_1.0.4
>> -AdiumX_1.0.5
>>  AdiumX_1.0.6
>>  AdiumX_1.1
>>  AdiumX_1.1.1
>> @@ -39,6 +23,4 @@
>> AdiumX_1.2.1
>> AdiumX_1.2.2
>> AdiumX_1.2.3
>> -adium-with-joscar
>> -adium-with-smack
>> -summer_of_code_2007
>> +tip
>>
>
> One of these tags, AdiumX_1.0.2, somehow became a branch:
>
>> hg branches                                 %~/Projects/ 
>> @otherpeoplesprojects/adium-hg(1)
>> default                        20950:6f91ae078b19
>> [snip]
>> AdiumX_1.0.2                   17619:3aa65b1d798f (inactive)

He responded that the last part is because of a commit (r19404) where  
I branched from that tag, and that most of the missing tags were  
missing because we'd deleted the branches that we'd copied them from.

I do not support using hg convert until there are no known data- 
losing (including tag-forgetting) bugs in it.





More information about the devel mailing list