On Fri, Sep 11, 2009 at 01:48:45PM +0200, Lukas Renggli wrote:
a couple of bugs when understanding the history based merge (ugly)
It is not a merge operation, as I said in my mail. You are merely applying the changes representing a delta between two versions manually. That's all, no magic involved.
? ? ? ?- adding the new method to a cs does not work if you did not install the code before (ok) ? ? ? ?- class definition are not added (yeah) in the changeset. Really cool!
I don't understand what this has to do with change-sets?
Class definitions are part of the patch that is calculated by Monticello. My guess is that the class didn't change for the delta you calculated. To illustrate, in the example above the changes between b.1 and b.2 don't show a class change that happened between a.1 and b.1, even if the delta depends on it.
I use what I described all the time, it is maybe a bit tricky, but works really well.
Stef, I don't know if this is helpful or not, but FYI Edgar De Cleene has produced the list of change sets corresponding to the MC update stream for Squeak trunk. See this thread on squeak-dev: http://lists.squeakfoundation.org/pipermail/squeak-dev/2009-September/139360... Dave