I thought I&#39;d try merging these trivial changes (minus cleanupSeaside), but when I checked the changes I was about to check in I noticed that a lot of the methods had changed. My installation script loads the packages in the following order: Pier-Tests, Pier-Tests-Model, Pier-Tests-Security. Here I show my ignorance again. I&#39;m assuming that Pier-Tests should be a &quot;super package&quot; for Pier-Tests-Model and Pier-Test-Security, however it seems that there&#39;s a significant difference between the packages. I&#39;m assuming that Pier-Tests-Model and Pier-Tests_Security supersedes Pier-Tests as the date stamps are later (September vs November). In which case I should check my changes into Pier-Tests-Model and then check in Pier-Tests so that the packages are again consistent. Does that make sense?<div>
<br></div><div>Nick <br><br><div class="gmail_quote">2010/1/6 Nick Ager <span dir="ltr">&lt;<a href="mailto:nick.ager@gmail.com">nick.ager@gmail.com</a>&gt;</span><br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
While I&#39;m stuck with the merge errors I had a look at the load errors:<div><p style="margin:0.0px 0.0px 0.0px 0.0px;font:12.0px Helvetica">PRCommandTest&gt;&gt;testTime (WAPlatform is Undeclared) </p><div class="im">
<p style="margin:0.0px 0.0px 0.0px 0.0px;font:12.0px Helvetica">PRCommandTest&gt;&gt;testTimestamp (WAPlatform is Undeclared)</p>
</div><p style="margin:0.0px 0.0px 0.0px 0.0px;font:12.0px Helvetica">PRCommandTest&gt;&gt;testDate (WAPlatform is Undeclared) </p>
<p style="margin:0.0px 0.0px 0.0px 0.0px;font:12.0px Helvetica">PRPersistencyTest&gt;&gt;testMutexForked (WAPlatform is Undeclared) </p><div class="im">
<p style="margin:0.0px 0.0px 0.0px 0.0px;font:12.0px Helvetica">PRSegmentPersistency&gt;&gt;cleanupSeaside (WAEntryPoint is Undeclared) </p></div></div><div><br></div><div>They were easy to fix simply by changing WAPlatform to GRPlatform. </div>

<div><br></div><div>However I&#39;m uncertain how to changethe code in <span style="font-family:Helvetica;font-size:12px">PRSegmentPersistency&gt;&gt;cleanupSeaside:</span></div><div><font face="Helvetica" size="3"><span style="font-size:12px"><br>

</span></font></div><div><div>cleanupSeaside</div><div><span style="white-space:pre">	</span>&quot;Clear all the entry points that reference other entry points, state and continuations by overriding them with a blank version. Do not try to call #clearAllHandlers because this spawns a new process. Also dump the default dispatcher just to be sure.&quot;</div>

<div><span style="white-space:pre">	</span>&lt;cleanup&gt;</div><div><br></div><div><span style="white-space:pre">	</span>WAEntryPoint allSubInstances</div><div><span style="white-space:pre">		</span>do: [ :entry | entry copyFrom: entry class basicNew ].</div>

<div><span style="white-space:pre">	</span>WADispatcher instVarNamed: &#39;default&#39; put: nil</div></div><div><br></div><div>My best guess is to replace the code with the call:</div><div>WARegistry clearAll</div>
<div><br></div><div>marks out out 10?<br><div><br><div class="gmail_quote">2010/1/6 Nick Ager <span dir="ltr">&lt;<a href="mailto:nick.ager@gmail.com" target="_blank">nick.ager@gmail.com</a>&gt;</span><div><div></div><div class="h5">
<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
I&#39;ve created a fresh seaside3.0a5 image, loaded Magritte and Pier into it and I&#39;ve failed at the first merge hurdle. I&#39;m starting with Magritte-Model and when I try merging from &#39;<a href="http://source.lukas-renggli.ch/magritte" target="_blank">http://source.lukas-renggli.ch/magritte</a>&#39; I get the error:<div>


<br></div><div>&#39;Could not find version &#39;&#39;Magritte-Model-lr.358&#39;&#39;. Maybe you need to add a repository?&#39;<br><br></div><div>any thoughts on my beginners error?</div><div><br></div><div>Thanks Nick</div>


<div><br><div class="gmail_quote">2010/1/6 Lukas Renggli <span dir="ltr">&lt;<a href="mailto:renggli@gmail.com" target="_blank">renggli@gmail.com</a>&gt;</span><div><div></div><div><br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">


<div>&gt; I&#39;m happy to have a go bringing the Pier 3.0 repository upto the latest 2.8<br>
&gt; codebase, but I&#39;ll need support. For example I&#39;m not sure how to diff code<br>
&gt; from two different repositories in Pharo..., plus my knowledge of Pier is<br>
&gt; still rudimentary - but I guess I&#39;ve got to start somewhere... Would it be a<br>
&gt; horrendous undertaking??<br>
<br>
</div>The process is simple: You load the latest Magritte/Pier 3.0 code into<br>
your image, then you add the old Magritte and Pier repositories using<br>
the &quot;+Repository&quot; button, open the repository browser on that<br>
repository, select the latest version of each package (e.g.<br>
Magritte-Core) and click on &quot;Merge&quot;.<br>
<br>
Normally merging should be really easy, but I don&#39;t know how much<br>
Magritte and Pier changed from the previous version. Also the merging<br>
does not work if the packages got renamed.<br>
<div><br>
Lukas<br>
<br>
--<br>
Lukas Renggli<br>
<a href="http://www.lukas-renggli.ch" target="_blank">http://www.lukas-renggli.ch</a><br>
<br>
_______________________________________________<br>
</div><div><div></div><div>Magritte, Pier and Related Tools ...<br>
<a href="https://www.iam.unibe.ch/mailman/listinfo/smallwiki" target="_blank">https://www.iam.unibe.ch/mailman/listinfo/smallwiki</a><br>
</div></div></blockquote></div></div></div><br></div>
</blockquote></div></div></div><br></div></div>
</blockquote></div><br></div>