ok thanks for checking. > Wait, I merged the wrong thing. I should have loaded > SLICE-issue496-headingRemoval-jannik_laval.2. > > Now I can explain the situation: > > - SLICE-issue496-headingRemoval-jannik_laval.2 depends on > EToys-jannik_laval.118. > > - In my Pharo 1.1. image there is EToys-StephaneDucasse.1, which is an > empty package. > > When you merge changes, Monticello calculates the delta between the > common ancestor (EToys-StephaneDucasse.1) and the two versions you > merge. > > - EToys-StephaneDucasse.1 to EToys-StephaneDucasse.1 is an empty > delta. > > - EToys-StephaneDucasse.1 to EToys-jannik_laval.118 is EToys- > jannik_laval.118. > > Obviously there are no conflicts and Monticello just loads > EToys-jannik_laval.118. It looks to me like the wrong base package is > loaded in Pharo 1.1. > > Cheers, > Lukas
_______________________________________________ Pharo-project mailing list [email protected] http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
