Re: [Pharo-project] funny behavior with MC

2010-03-25 Thread Stéphane Ducasse
On Mar 24, 2010, at 10:50 PM, Lukas Renggli wrote: So this is probably a glitch somewhere I doubt so. Lukas: I ***KNOW*** how MC branching/merging works. I KNOW IT. Now I'm trying to understand how the moved package could be moved in treated while it should have been to pharo. I

[Pharo-project] funny behavior with MC

2010-03-24 Thread Stéphane Ducasse
this is strange before lunch I could select Polymorph-Widgets and merge at will and now I cannot anymore because I got a message could not find versions for example 107 Now this is really strange because this is the first version that was merged so normally it should be found. It is either in

Re: [Pharo-project] funny behavior with MC

2010-03-24 Thread Lukas Renggli
this is strange before lunch I could select Polymorph-Widgets and merge at will and now I cannot anymore because I got a message could not find versions for example 107 This problem is to be expected when you move or delete versions. You see this message when the closest ancestor of the

Re: [Pharo-project] funny behavior with MC

2010-03-24 Thread Stéphane Ducasse
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. 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. Setf On Mar 24,

Re: [Pharo-project] funny behavior with MC

2010-03-24 Thread Lukas Renggli
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

Re: [Pharo-project] funny behavior with MC

2010-03-24 Thread Stéphane Ducasse
On Mar 24, 2010, at 6:46 PM, Lukas Renggli wrote: 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

Re: [Pharo-project] funny behavior with MC

2010-03-24 Thread Lukas Renggli
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

Re: [Pharo-project] funny behavior with MC

2010-03-24 Thread Dale Henrichs
Stef and Lukas, The other situation that I have seen these types of errors is when the package that I am merging into(?) does not have the repository where the common ancestor mcz file is located. For example if I have Seaside.gemstone-dkh.500 with http://seaside.gemstone.com/ss/seaside in

Re: [Pharo-project] funny behavior with MC

2010-03-24 Thread Stéphane Ducasse
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

Re: [Pharo-project] funny behavior with MC

2010-03-24 Thread Stéphane Ducasse
This is normal because ancestry cross over repository. I think that there is something really strange. EIther you get a truly distributed system or you get a local. With MC you get a distributed which can be brittle (even if I understand well the problem ancestry is solving). I think that a

Re: [Pharo-project] funny behavior with MC

2010-03-24 Thread Lukas Renggli
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        

Re: [Pharo-project] funny behavior with MC

2010-03-24 Thread Stéphane Ducasse
I know now let me repeat the bug I see This is not a bug of Monticello. It is or may be of the network because tell me the difference between scenario 1 and scenario 2? I think that you do not read what I'm writing. There is no difference except that in the first scenario it barks and the

Re: [Pharo-project] funny behavior with MC

2010-03-24 Thread Lukas Renggli
So this is probably a glitch somewhere I doubt so. Lukas: I ***KNOW*** how MC branching/merging works. I KNOW IT. Now I'm trying to understand how the moved package could be moved in treated while it should have been to pharo. I imagine that when you browsed the different repositories you