On 08.05.2011, at 08:53, Nicolas Cellier wrote:

> 2011/5/8 Nicolas Cellier <nicolas.cellier.aka.nice at gmail.com>:
>> 2011/5/8 Frank Shearar <frank.shearar at angband.za.org>:
>>> On 2011/05/08 10:35, commits at source.squeak.org wrote:
>>>> 
>>>> Nicolas Cellier uploaded a new version of Tools to project The Trunk:
>>>> http://source.squeak.org/trunk/Tools-nice.351.mcz
>>>> 
>>>> ==================== Summary ====================
>>>> 
>>>> Name: Tools-nice.351
>>>> Author: nice
>>>> Time: 8 May 2011, 12:34:49.092 pm
>>>> UUID: 2e69b8f1-a57b-4988-ac7a-07d53acd090e
>>>> Ancestors: Tools-fbs.350
>>>> 
>>>> minor refactorings: use #anySatisfy: #allSatisfy: #noneSatisfy: where it
>>>> simplifies
>>>> 
>>>> =============== Diff against Tools-fbs.350 ===============
>>> 
>>> If this comes off fbs.350, what happens to fbs.351?
>>> 
>>> In another DVCS I would expect 351 to be disregarded, which means that 349
>>> will not be part of HEAD/tip:
>>> 
>>>      /-- fbs.349 --\
>>> -- fbs.348        fbs.351
>>>      \-- fbs.350 --/
>>>              \-- nice.351 -->
>>> 
>>> 
>>> frank
>>> 
>> 
>> I don't know, either Levente repair the merge behavior or we'll do it
>> manually...
>> 
>> Nicolas
>> 
> 
> I moved fbs.351 to trunk, so now we still have a branch concurrency test case...
> 
> Nicolas

You need to publish a merged version. The merge feature when updating is only meant to not overwrite your own changes.

- Bert -