Smalltalk › Squeak › Squeak - Dev

Monticello merging doesn't work in squeak-dev 49

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

3 messages Options

Bryce Kampjes

Monticello merging doesn't work in squeak-dev 49

If you merge two versions of a package in squeak-dev version 49 then
clicking on a difference causes a DNU in
MCMergeBrowser>>shoutAboutToStyle:. MCConflict does not understand
isAddition.

Switching the preference for Shout off allows Monticello merging
to work. I'm guessing this is a version mismatch between Shout and
Monticello.

Bryce

Damien Cassou-3

Re: Monticello merging doesn't work in squeak-dev 49

[hidden email] a écrit :
> If you merge two versions of a package in squeak-dev version 49 then
> clicking on a difference causes a DNU in
> MCMergeBrowser>>shoutAboutToStyle:. MCConflict does not understand
> isAddition.
>
> Switching the preference for Shout off allows Monticello merging
> to work. I'm guessing this is a version mismatch between Shout and
> Monticello.

Thank you for this report.

Andrew Tween

Re: Monticello merging doesn't work in squeak-dev 49

In reply to this post by Bryce Kampjes

Hi,
<[hidden email]> wrote in message
news:[hidden email]...
> If you merge two versions of a package in squeak-dev version 49 then
> clicking on a difference causes a DNU in
> MCMergeBrowser>>shoutAboutToStyle:. MCConflict does not understand
> isAddition.

Thanks for reporting this.
This is now fixed in http://www.squeaksource.com/shout/ShoutMonticello.1-tween.2

Damien - I have updated the squeak-dev pier page with the above details.

Andy