[CWB] Best, faster and safe way to upgrade cqpweb

[Hardie, Andrew]

Hi Andrés,

You're under a misapprehension... branches/3.2.5 and branches/3.2.6 are older 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.)

branches/3.2.latest presently contains v3.2.44.

v3.2.44 is now a year old. I am probably never going to do another update to v3.2.

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.

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.

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).

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.

Hope that helps

best

Andrew.

From: cwb-bounces at sslmit.unibo.it <cwb-bounces at sslmit.unibo.it> On Behalf Of Andrés Chandía
Sent: Sunday, May 26, 2024 1:11 PM
To: Open source development of the Corpus WorkBench <cwb at sslmit.unibo.it>
Subject: [CWB] Best, faster and safe way to upgrade cqpweb

Hi there,
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...
With
svn update
I've got:
Actualizado a la revisión 1882.
Summary of conflicts:
  Text conflicts: 19
  Tree conflicts: 147

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...

So I decided to go through a version by version upgrade...
With
svn switch http://svn.code.sf.net/p/cwb/code/gui/cqpweb/branches/3.2-latest
I've got
Actualizado a la revisión 1882.
Summary of conflicts:
  Text conflicts: 3
  Tree conflicts: 148
I've gone through the process not accepting deletions, and merging files, all seemed to go well, the page and corpus are accessible

>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.
Unsuccessful attempt, as with version 3.2.6.
With
svn switch http://svn.code.sf.net/p/cwb/code/gui/cqpweb/branches/3.2.5
or
svn switch http://svn.code.sf.net/p/cwb/code/gui/cqpweb/branches/3.2.6
I've got
Summary of conflicts:
  Text conflicts: 11
  Tree conflicts: 24
I've tried both initial approaches with the same unsuccessful results...

Thanks in advance for your advice.


Andrés Chandía
Unitat de Traducció i Ciències del Llenguatge
Roc Boronat 138, C. P.: 08018, Barcelona
Tel.: 935 055 722 - mail:andres.chandia at upf.edu<mailto:andres.chandia at upf.edu>


[http://www.chandia.net/sites/default/files/chandia.net__0.png]<http://www.chandia.net/>[http://www.chandia.net/sites/default/files/ico_tw.png]<https://twitter.com/chandianet>
mail:andres at chandia.net<mailto:andres at chandia.net>
________________________________
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://liste.sslmit.unibo.it/pipermail/cwb/attachments/20240528/30a86701/attachment.html>