>>>
> The ancestry cannot be lost. The .mcz files are the one thing that can
> disappear.
Yes I know but the result is the same.
>>
> The working copy is just one of the variable things in the merge.
> There is also the other version you load (and that might be different
> in your scenarios), and the common ancestor between the two (again
> that might be different in your scenarios).
I know.
>> Yes i see what you mean. You cannot use the ancestry to do a clever merge.
>> What I meant is that we should be able to see what changed
>> based on the latest loaded version (no need to have the complete ancestor
>> since it is broken).
>
> The ancestry is not broken! The problem is that you miss *ancestor
> versions*, because they were deleted or moved.
I know now since we systematically merge during our process I wonder how we
break it.
May be this is when you publish the smalltalk rewrite. Could check if you have
Polymorph-Widgets-lr.214 in your local cache?
I know now let me repeat the bug I see
scenario1
working copy polymorphWiget.7.mcz
I click on polymorphWiget.24.mcz
merge
-> I get an error ancestor cannot be found
scenario1
working copy polymorphWiget.7.mcz
I click on polymorphWiget.7.mcz
merge
-> no changes (ok this is what I hope what arriving)
Then
I click on polymorphWiget.24.mcz
merge
-> I get no error.
So for me there is something strange.
Stef
_______________________________________________
Pharo-project mailing list
[email protected]
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
