On Nov 7, 2009, at 8:45 AM, Lukas Renggli wrote: > When I merge Morphic-jannik_laval.400 into the latest Pharo 1.1 I do > not get a class called Presenter. > > Or what ***exactly*** did you try to do?
***Thanks*** for trying. I merged the slice and I was puzzled. I will redo today after fixing my house (as usual). Stef > > Lukas > > > > 2009/11/5 Stéphane Ducasse <[email protected]>: >> >> On Nov 4, 2009, at 9:38 PM, Lukas Renggli wrote: >> >>>> Lukas in my example in fact Presenter was removed as well as other >>>> methods. >>>> Then since they were present at the time jannik commited they >>>> reappear >>>> when I merge >>>> and I do not see why they are not at least tagged with conflicts. >>> >>> If you remove Presenter and Jannik does not touch it, then it should >>> remain removed after the merge. >> >> >> yes this is what I thought (or at least a conflict) >> >>> If you remove Presenter and Jannik does touch it, then you should >>> get >>> a conflict. >> >> Yes this is what I thought too :) >> >>> Presenter can only reappear, if in your delta or in the delta of >>> Jannik the Presenter is added (which doesn't seem to make sense, >>> so I >>> don't understand). >> >> me neither :) >> because Jannik did not touch it. >> Can you give a try to do a merge of heading removal in the latest 1,1 >> image to see >> if you get the same behavior. >> >>> >>> 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 >> >> >> _______________________________________________ >> Pharo-project mailing list >> [email protected] >> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project >> > > > > -- > Lukas Renggli > http://www.lukas-renggli.ch > > _______________________________________________ > Pharo-project mailing list > [email protected] > http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project _______________________________________________ Pharo-project mailing list [email protected] http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
