<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:x="urn:schemas-microsoft-com:office:excel" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<meta name="Generator" content="Microsoft Word 15 (filtered medium)">
<!--[if !mso]><style>v\:* {behavior:url(#default#VML);}
o\:* {behavior:url(#default#VML);}
w\:* {behavior:url(#default#VML);}
.shape {behavior:url(#default#VML);}
</style><![endif]--><style><!--
/* Font Definitions */
@font-face
{font-family:"Cambria Math";
panose-1:2 4 5 3 5 4 6 3 2 4;}
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
@font-face
{font-family:Verdana;
panose-1:2 11 6 4 3 5 4 4 2 4;}
@font-face
{font-family:Aptos;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0cm;
font-size:12.0pt;
font-family:"Aptos",sans-serif;}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:blue;
text-decoration:underline;}
span.EmailStyle18
{mso-style-type:personal-reply;
font-family:"Verdana",sans-serif;
color:#1F497D;}
.MsoChpDefault
{mso-style-type:export-only;
font-size:10.0pt;
mso-ligatures:none;}
@page WordSection1
{size:612.0pt 792.0pt;
margin:72.0pt 72.0pt 72.0pt 72.0pt;}
div.WordSection1
{page:WordSection1;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext="edit" spidmax="1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1" />
</o:shapelayout></xml><![endif]-->
</head>
<body lang="EN-GB" link="blue" vlink="purple" style="word-wrap:break-word">
<div class="WordSection1">
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Verdana",sans-serif;color:#1F497D;mso-fareast-language:EN-US">Hi Andrés,<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Verdana",sans-serif;color:#1F497D;mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Verdana",sans-serif;color:#1F497D;mso-fareast-language:EN-US">You’re under a misapprehension… branches/3.2.5 and branches/3.2.6 are
<i>older</i> than branches/3.2.latest. (Basic ally, after v3.2.6 I decided to stop creating different branches for every tiny increment; that’s what version history is for.)<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Verdana",sans-serif;color:#1F497D;mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Verdana",sans-serif;color:#1F497D;mso-fareast-language:EN-US">branches/3.2.latest presently contains v3.2.44.
<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Verdana",sans-serif;color:#1F497D;mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Verdana",sans-serif;color:#1F497D;mso-fareast-language:EN-US">v3.2.44 is now a year old. I am probably never going to do another update to v3.2.<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Verdana",sans-serif;color:#1F497D;mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Verdana",sans-serif;color:#1F497D;mso-fareast-language:EN-US">So your first plan – to update your v3.2.43 installation on the 3.2.latest branch, and then resolve your conflicts (which I assume
are due to your own local file modifications) – was the correct one. You shouldn’t need to touch v3.2.5/6.<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Verdana",sans-serif;color:#1F497D;mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Verdana",sans-serif;color:#1F497D;mso-fareast-language:EN-US">I am not sure what branch you were on to start with if switching to branches/3.2.latest got a different result than updating prior
to your switch. To have been running v3.2.43, it would have been necessary to be on that branch already. <o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Verdana",sans-serif;color:#1F497D;mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Verdana",sans-serif;color:#1F497D;mso-fareast-language:EN-US">I don’t know why your two attempts to resolve the conflicts failed; I suggest you examine the different version files that SVN will
put on disk to ascertain that. (You can resolve the difference by modifying these files manually).
<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Verdana",sans-serif;color:#1F497D;mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Verdana",sans-serif;color:#1F497D;mso-fareast-language:EN-US">But those issues aside, at the point when you had this result “all seemed to go well, the page and corpus are accessible” – you were
probably correctly updated to v3.2.44 at that juncture.<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Verdana",sans-serif;color:#1F497D;mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Verdana",sans-serif;color:#1F497D;mso-fareast-language:EN-US">Hope that helps<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Verdana",sans-serif;color:#1F497D;mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Verdana",sans-serif;color:#1F497D;mso-fareast-language:EN-US">best<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Verdana",sans-serif;color:#1F497D;mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Verdana",sans-serif;color:#1F497D;mso-fareast-language:EN-US">Andrew.<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Verdana",sans-serif;color:#1F497D;mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<div>
<div style="border:none;border-top:solid #E1E1E1 1.0pt;padding:3.0pt 0cm 0cm 0cm">
<p class="MsoNormal"><b><span lang="EN-US" style="font-size:11.0pt;font-family:"Calibri",sans-serif">From:</span></b><span lang="EN-US" style="font-size:11.0pt;font-family:"Calibri",sans-serif"> cwb-bounces@sslmit.unibo.it <cwb-bounces@sslmit.unibo.it>
<b>On Behalf Of </b>Andrés Chandía<br>
<b>Sent:</b> Sunday, May 26, 2024 1:11 PM<br>
<b>To:</b> Open source development of the Corpus WorkBench <cwb@sslmit.unibo.it><br>
<b>Subject:</b> [CWB] Best, faster and safe way to upgrade cqpweb<o:p></o:p></span></p>
</div>
</div>
<p class="MsoNormal"><o:p> </o:p></p>
<div>
<div>
<div>
<p class="MsoNormal"><span style="color:#0B5394">Hi there,<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span 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...<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="color:#0B5394">With<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="color:#0B5394">svn update<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="color:#0B5394">I've got:<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="color:#0B5394">Actualizado a la revisión 1882.<br>
Summary of conflicts:<br>
Text conflicts: 19<br>
Tree conflicts: 147<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="color:#0B5394"><o:p> </o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span 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...<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="color:#0B5394"><o:p> </o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="color:#0B5394">So I decided to go through a version by version upgrade...<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="color:#0B5394">With<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="color:#0B5394">svn switch </span><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><span style="color:#0B5394"><o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="color:#0B5394">I've got<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="color:#0B5394">Actualizado a la revisión 1882.<br>
Summary of conflicts:<br>
Text conflicts: 3<br>
Tree conflicts: 148<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span 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<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="color:#0B5394"><o:p> </o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span 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.<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="color:#0B5394">Unsuccessful attempt, as with version 3.2.6.<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="color:#0B5394">With<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="color:#0B5394">svn switch </span><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><span style="color:#0B5394">
<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="color:#0B5394">or<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="color:#0B5394">svn switch </span><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><span style="color:#0B5394"><o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="color:#0B5394">I've got<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="color:#0B5394">Summary of conflicts:<br>
Text conflicts: 11<br>
Tree conflicts: 24<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="color:#0B5394">I've tried both initial approaches with the same unsuccessful results...<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="color:#0B5394"><o:p> </o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="color:#0B5394">Thanks in advance for your advice.<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="color:#0B5394"><br clear="all">
<o:p></o:p></span></p>
</div>
<div>
<div>
<div>
<p><b><i><span lang="FR" style="font-size:10.0pt;font-family:"Verdana",sans-serif;color:#C8102E">Andrés Chandía</span></i></b><span lang="FR"><br>
</span><span lang="FR" style="font-size:10.0pt;font-family:"Verdana",sans-serif;color:#C8102E">Unitat de Traducció i Ciències del Llenguatge<br>
Roc Boronat 138, C. P.: 08018, Barcelona<br>
Tel.: 935 055 722 - </span><a href="mailto:andres.chandia@upf.edu" target="_blank"><span lang="FR" style="font-size:10.0pt;font-family:"Verdana",sans-serif;color:#C8102E">mail:andres.chandia@upf.edu</span></a><span lang="FR"><o:p></o:p></span></p>
<p><span lang="FR"><o:p> </o:p></span></p>
<table class="MsoNormalTable" border="0" cellpadding="0" width="100%" style="width:100.0%">
<tbody>
<tr>
<td width="14%" style="width:14.0%;padding:0cm 0cm 0cm 0cm">
<p class="MsoNormal"><a href="http://www.chandia.net/" target="_blank"><span style="text-decoration:none"><img border="0" width="190" height="80" style="width:1.9791in;height:.8333in" id="_x0000_i1032" src="http://www.chandia.net/sites/default/files/chandia.net__0.png"></span></a><a href="https://twitter.com/chandianet" target="_blank"><span style="text-decoration:none"><img border="0" width="26" height="26" style="width:.2708in;height:.2708in" id="_x0000_i1031" src="http://www.chandia.net/sites/default/files/ico_tw.png"></span></a><o:p></o:p></p>
</td>
<td style="padding:1.5pt 1.5pt 1.5pt 1.5pt">
<p class="MsoNormal"><a href="mailto:andres@chandia.net" target="_blank"><span style="font-size:10.0pt;font-family:"Verdana",sans-serif">mail:andres@chandia.net</span></a><o:p></o:p></p>
</td>
</tr>
</tbody>
</table>
<div class="MsoNormal" align="center" style="text-align:center">
<hr size="1" width="100%" noshade="" style="color:#C8102E" align="center">
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</body>
</html>