>>> 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. > > You did not get me right > > scenario 1: I click on the slice press merge get an error ancestor not > found > scenario 2: I click on the **latest working copy version* that led to > the error of scenario and do merge I get no changes of course
I do not understand. - What is the "latest working copy version"? The working copy is the code you currently have in your image. - What do slices have to do with this? They shouldn't, because in the end the dependent versions are merged individually. > + scenario 1 and it merges without the error of scenario 1 (it means > that he suddenly magically found the ancestry) The ancestry cannot be lost. The .mcz files are the one thing that can disappear. > for me there is a bug. Because between scenario 1 and 2 there is no > difference since this is exactly the same version that I have > as working copy. 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). > 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. > Because often using the latest working copy and having the diff is only what > I need. Is whatI'm sayign make sense? To get a diff between your working copy and a version you select this version and click on changes. That doesn't require any other version but the selected one. It doesn't even use the ancestry information. No, I can't make sense of it :-) 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
