Hi Nicolai, For https://pharo.fogbugz.com/f/cases/14427 (renaming CompressionTests) and https://pharo.fogbugz.com/f/cases/14426 (BaloonTests) it worked without a problem.
For others I got the mentioned merge conflict now from the monkey validation. I tried manually using Monticello tools and it seems that the manual merge fails in 40374 because PSMCChangesGrouper #visitClassTraitDefinition: gives a DNU which another problem. I opened a new issue for this: https://pharo.fogbugz.com/f/cases/14494/PSMCChangesGrouper-is-missing-visitClassTraitDefinition and I provide a naive fix. If possible someone should review #14494 or help with the others. Anyone some Banana to feed to the monkey? Thx T. Gesendet: Dienstag, 18. November 2014 um 22:50 Uhr Von: "Nicolai Hess" <[email protected]> An: "Pharo Development List" <[email protected]> Cc: "Torsten Bergmann" <[email protected]> Betreff: Merge conflict for "META Case: restructure Tests and test packages" for example : https://pharo.fogbugz.com/default.asp?14433[https://pharo.fogbugz.com/default.asp?14433] I don't why there is a merge conflict, maybe it is how the slice is created.I think the restructuring (moving all classes from XXXTest to XXX-Tests) would work if we delete the empty XXXTests package before creating the slice. nicolai
