Re: [Pharo-users] Slice loading/merging differences question

2014-08-08 Thread Tim Mackinnon
stepharo wrote When we integrate changes we systematically merge so that even if you did a fix on a not recent version we get both improvements. Stef - just to check on this, in the case of fogbugz 13526 - if you just merge, you don't pick up the requirement to load fogbugz 13787? So how do

[Pharo-users] Slice loading/merging differences question

2014-08-07 Thread Tim Mackinnon
Hi - I am still a bit confused about the difference between load vs. merge with Monticello? Last month, when I tried to verify a bug fix, I did a load - and it caused other things (dependencies?) to be loaded into my clean image and so I ended up with something else in a broken state. So I had

Re: [Pharo-users] Slice loading/merging differences question

2014-08-07 Thread stepharo
to complement mariano great answer. When we integrate changes we systematically merge so that even if you did a fix on a not recent version we get both improvements. Stef On 7/8/14 18:15, Tim Mackinnon wrote: Hi - I am still a bit confused about the difference between load vs. merge with

Re: [Pharo-users] Slice loading/merging differences question

2014-08-07 Thread Ben Coman
Mariano Martinez Peck wrote: Hi Tim, Normally...a load simply loads that version you are telling to load. If you have local changes in any of the packages you will be loading, those changes will be LOST and overridden with the ones of the version you are loading. If you load via