I know how to deal with the merge dialogs, it's not a problem *for me*. I
know how to manually change the ancestry so it looks like a clean package
again after merging. But not everybody does, and I wouldn't expect them to.
The point of having a simple "update" button is that it pretty much "just
works".

It it is a problem for someone downloading the release image and trying to
switch to trunk. There shouldn't be any unnecessary merge dialogs.

(another problem is that in the release image not all packages are clean)

- Bert -


On Wed, Aug 24, 2016 at 1:50 PM, marcel.taeumel <Marcel.Taeumel at hpi.de>
wrote:

> marcel.taeumel wrote
> >
> > Bert Freudenberg wrote
> >> ... shows lots of merge dialogs. We need to merge the 5.1 specific
> >> versions
> >> back into trunk, I guess?
> >>
> >> - Bert -
> > I did copy some MCZ but made some other changes twice. No need to copy
> MCZ
> > at the moment. All changes in 5.1 are already in trunk. If in doubt, hit
> > "accept".
> >
> > Best,
> > marcel
>
> I double-checked. There were 3 merge dialogs for these three methods:
>
> ScrollBar >> #scrollPageInit:
> View >> #setDefaultBackgroundColor
> ReleaseBuilder class >> #initialize
>
> When converting a 5.1 image to Trunk, just accept the incoming changes.
>
> Best,
> Marcel
>
>
>
> --
> View this message in context: http://forum.world.st/Loading-
> trunk-updates-in-5-1-tp4912465p4912479.html
> Sent from the Squeak - Dev mailing list archive at Nabble.com.
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.squeakfoundation.org/pipermail/squeak-dev/attachments/20160825/620cec78/attachment-0001.htm