> what is strange is that when I merge the latest loaded version I got the > normal "no changes" > and I could merge without having to add a new repository.
Sure, because in this situation the common ancestor is the version you load (so it can always be found). And the delta between the working copy and the version you merge is empty, so you have no changes. > I think that in squeak they cut the problem (if you do not have the history > what do you do). > You should still be able to merge. I don't think they do anything different? If the ancestor version is missing you simply cannot do a meaningful merge. It is as simple as that. Lukas -- Lukas Renggli http://www.lukas-renggli.ch _______________________________________________ Pharo-project mailing list [email protected] http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
