<div dir="ltr"><div class="gmail_default" style="color:#0b5394"></div><div class="gmail_default" style="color:#0b5394">Hi there,</div><div class="gmail_default" style="color:#0b5394">I'm asking for advice on how to proceed with cqp web upgrading because I've spent an entire day trying to upgrade cqpweb v3.2.43 to a newer version...</div><div class="gmail_default" style="color:#0b5394">With</div><div class="gmail_default" style="color:#0b5394">svn update</div><div class="gmail_default" style="color:#0b5394">I've got:</div><div class="gmail_default" style="color:#0b5394">Actualizado a la revisión 1882.<br>Summary of conflicts:<br> Text conflicts: 19<br> Tree conflicts: 147</div><div class="gmail_default" style="color:#0b5394"><br></div><div class="gmail_default" style="color:#0b5394">I went through this process twice, two different strategies concerning the messages appearing, mainly one accepting deletions, and the other accepting the working copy, but none of them ended up working, the page was not accessible...</div><div class="gmail_default" style="color:#0b5394"><br></div><div class="gmail_default" style="color:#0b5394">So I decided to go through a version by version upgrade...</div><div class="gmail_default" style="color:#0b5394">With<br></div><div class="gmail_default" style="color:#0b5394">svn switch <a href="http://svn.code.sf.net/p/cwb/code/gui/cqpweb/branches/3.2-latest">http://svn.code.sf.net/p/cwb/code/gui/cqpweb/branches/3.2-latest</a></div><div class="gmail_default" style="color:#0b5394">I've got</div><div class="gmail_default" style="color:#0b5394">Actualizado a la revisión 1882.<br>Summary of conflicts:<br> Text conflicts: 3<br> Tree conflicts: 148<br></div><div class="gmail_default" style="color:#0b5394">I've gone through the process not accepting deletions, and merging files, all seemed to go well, the page and corpus are accessible</div><div class="gmail_default" style="color:#0b5394"><br></div><div class="gmail_default" style="color:#0b5394">From here I tried to go up first to version 3.2.5, which by the way, it's not even mentioned in the cqp web admin manual.</div><div class="gmail_default" style="color:#0b5394">Unsuccessful attempt, as with version 3.2.6.</div><div class="gmail_default" style="color:#0b5394">With</div><div class="gmail_default" style="color:#0b5394">svn switch <a href="http://svn.code.sf.net/p/cwb/code/gui/cqpweb/branches/3.2.5">http://svn.code.sf.net/p/cwb/code/gui/cqpweb/branches/3.2.5</a> <br></div><div class="gmail_default" style="color:#0b5394">or<br></div><div class="gmail_default" style="color:#0b5394"></div><div class="gmail_default" style="color:#0b5394">svn switch <a href="http://svn.code.sf.net/p/cwb/code/gui/cqpweb/branches/3.2.6">http://svn.code.sf.net/p/cwb/code/gui/cqpweb/branches/3.2.6</a></div><div class="gmail_default" style="color:#0b5394"></div><div class="gmail_default" style="color:#0b5394">I've got</div><div class="gmail_default" style="color:#0b5394">Summary of conflicts:<br> Text conflicts: 11<br> Tree conflicts: 24</div><div class="gmail_default" style="color:#0b5394">I've tried both initial approaches with the same unsuccessful results...</div><div class="gmail_default" style="color:#0b5394"><br></div><div class="gmail_default" style="color:#0b5394">Thanks in advance for your advice.</div><div class="gmail_default" style="color:#0b5394"><br clear="all"></div><div><div dir="ltr" class="gmail_signature" data-smartmail="gmail_signature"><div dir="ltr"><p><font style="font-family:Verdana,sans-serif;font-size:10pt;font-weight:bold;font-style:italic;color:rgb(200,16,46)">Andrés Chandía</font><br>
<font style="font-family:Verdana,sans-serif;font-size:10pt;color:rgb(200,16,46)">Unitat de Traducció i Ciències del Llenguatge<br>
Roc Boronat 138, C. P.: 08018, Barcelona<br>
Tel.: 935 055 722 - <a style="font-family:Verdana,sans-serif;font-size:10pt;color:rgb(200,16,46)" href="mailto:andres.chandia@upf.edu" target="_blank">mail:andres.chandia@upf.edu</a></font></p>
<p><br></p>
<table dir="ltr" width="100%" cellspacing="2" cellpadding="2">
<tbody>
<tr><td style="border:none;padding:0cm" width="14%"><a href="http://www.chandia.net" target="_blank"><img src="http://www.chandia.net/sites/default/files/chandia.net__0.png" width="190" height="80"></a><a href="https://twitter.com/chandianet" target="_blank"><img src="http://www.chandia.net/sites/default/files/ico_tw.png" width="26" height="26"></a></td>
<td><a style="font-family:Verdana,sans-serif;font-size:10pt" href="mailto:andres@chandia.net" target="_blank">mail:andres@chandia.net</a></td></tr>
</tbody></table>
<hr style="height:1px;border-width:0;color:rgb(200,16,46);background-color:rgb(200,16,46)">
</div></div></div></div>