On Mon, 21 Feb 2011, Ken G. Brown wrote:

>
>
> Ken,
> from my iPhone
>
> On 2011-02-21, at 22:40, Levente Uzonyi <leves at elte.hu> wrote:
>
>> On Mon, 21 Feb 2011, Ken G. Brown wrote:
>>
>>> In Squeak 4.2 trunk 11035, when I look at a package in Monticello, namely SUnit in  'http://www.squeaksource.com/Testing', I get different results in the listings when I click Merge vs Changes. A bunch of removes are there in Changes listing but not in the Merge listing.
>>>
>>> If I do not want the removes done when loading, how do I tell MC to reject them if I cannot see them in the Merge panes.
>>>
>>> What causes the differences between the listings?
>>
>> Let's say you have two versions A and B. Changes will give you a set of operations that transform A to B. Merge will create a set of operations that give you A+B.
>
> So it looks like to me that all the changes to transform A to B are not available for reject or keep. How do you selectively reject some of those changes that are not visible in the merge?

You can't decide about non-conflicting differences when merging, because 
it wants to give you A+B, not A+B-whatYouDontWant.


Levente

>
> Thx,
> Ken
>
>
>> Levente
>>
>>>
>>> Thx for any insight,
>>> Ken G. Brown
>>>
>>>
>>
>
>