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
bryce@kampjes.demon.co.uk 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.
Hi, bryce@kampjes.demon.co.uk wrote in message news:17759.10918.646593.325462@gargle.gargle.HOWL...
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
squeak-dev@lists.squeakfoundation.org
-
Andrew Tween -
bryce＠kampjes.demon.co.uk -
Damien Cassou