As I&#39;m still not terribly comfortable with the merging tools in Pharo, I&#39;ve tried to be as cautious as possible:<div>1) check there are no changes against in my image from magritte2 or pier2 repositories.</div><div>
2) merge with magritte or pier repository - if uncertain check changes over last few months in 2.8 repositories</div><div>3) check the merged code for expected differences in the magritte2 or pier2 repositories</div><div>
<br></div><div><br></div><div>Magritte-Model &amp; Magritte-Pharo-Model</div><div>Merge was straightforward. examining the differences after merge between the two repositories I noticed:</div><div>MACompatibility doesn&#39;t exist with most of the methods being moved to GRPlatform. However request:default: has been added in MACompatibility for which there doesn&#39;t appear to be a equivalent in GRPlatform Also I couldn&#39;t find an equivalent of openWorkspace:titled: in GRPlatform. So I added magritteRequest:default: and magritteOpenWorkspace:title to GRPlatform with Pharo implementations in GRPharoPlatform.</div>
<div><br></div><div>Magritte-Tests</div><div>Lots of merge conflicts, but then I realised that I&#39;d only loaded Magritte-Tests-Model and Magritte-Tests-Pharo-Model *not* Magritte-Tests - Suddenly what was being said previously in the list about maintaining version history made sense. I reloaded the tests and tried to merge again. No merge conflicts, only three updated methods.</div>
<div>-all tests pass-</div><div><br></div><div>Magritte-Morph</div><div>No changes - though I fixed the load error in MAFileMorph&gt;&gt;choose I changed FileList2 -&gt; FileList</div><div><br></div><div>Magritte-Seaside &amp; Magritte-Pharo-Seaside</div>
<div>Straightforward merge, didn&#39;t spot anything which needed to be changed for cross-platform</div><div><br></div><div><br></div><div>Pier</div><div>------</div><div>What&#39;s the purpose of the Magritte-Model, Magritte-Seaside and Magritte-Tests packages in the pier2 repository? I used the packages in the magritte2 repository. Hope that was the plan.</div>
<div><br></div><div>Pier-Core - empty package</div><div><br></div><div>Pier-Model</div><div>lots of changes but only a couple of merge conflicts and a couple of s/asString/greaseString/ and one s/allSubInstancesOf:do:/magritteAllSubInstancesOf:do:/</div>
<div><br></div><div>Pier-Seaside</div><div>lots of changes, but again only a couple of merge conflicts and one s/displayString/greaseString/</div><div><br></div><div>Pier-Security</div><div>only a couple of methods had changed, one merge conflict</div>
<div><br></div><div>Pier-Tests</div><div>lots of changes, only one merge conflict</div><div>-all tests pass-</div><div><br></div><div>I&#39;m about the save the merged code, but when I try I get an Error: HTTP1.1 401 Unauthorized</div>
<div>Does someone need to give me write permissions to <a href="http://source.lukas-renggli.ch/magritte2">http://source.lukas-renggli.ch/magritte2</a> and <a href="http://source.lukas-renggli.ch/pier2">http://source.lukas-renggli.ch/pier2</a></div>
<div><br></div><div>Cheers</div><div><br></div><div>Nick</div><div><br></div><div><br></div>