Architecture / Installation

Posted by bertrand Gugger 19 Feb 2005 12:53 GMT-0000 posts: 47

Hi,
Why are the diff so important the patching not works ?
are you upgrading several versions in once ?
do you have more info? (perhaps remove the -q quiet option from cvs command)
Could you give an example for one script ?
--
à+
bertrand Gugger
http://toggg.com/

Posted by Bernard Sfez / Tiki Specialist 20 Feb 2005 05:56 GMT-0000 posts: 8654

Salut Bertrand,

Thanks for trying to help.

I'm upgrading only one website on one domain.

I think diff are not so important and here an exemple.

On the fr language i made little cosmetics changes.(/xxxx/tikiwiki/lang/fr)

After the update i got several like this bellow;

"Envoyer à un groupe",
>>>>>>> 1.147.2.63

Result on the website is;
"Parse error: parse error, unexpected T_SL, expecting ')' in /home/httpd/vhosts/israelfr.com/httpdocs/tikiwiki/lang/fr/language.php on line xxx"

This is the easiest to see and deal with, but i fear about changes in others scripts where it is far harder to track them.

PS : Do you thinks that instead of trying to clean the code i should redo an update (removing the -q quiet option from cvs command) ?

Posted by bertrand Gugger 20 Feb 2005 14:23 GMT-0000 posts: 47

Salut yoni,
First I must first warn you: I'm no cvs guru 😀
The same problem will occur by me so I also want some solution.

My questions were quite unclear:
>Why are the diff so important the patching not works ?

If you cannot avoid such customizations of the scripts, then try to do them staying the closer possible of the original code. Don't change the lines order, try to make some clear blocks of your changes. Unfortunately it's certainly not allways possible 🙁

>are you upgrading several versions in once ?

To get success here the best is to upgrade version after version.
e.g. don't upgrade directly from 1.8.2 to 1.8.5
but do each step.
If you're CVS then make it as often as possible, that's the best.
Say each week at least, to minimize the changes to take into account.
(our fellows dev are hard workers 😁
You must notify that 1.8.x to 1.9 is a "big jump" as a lot of scripts & folders have been reorganized. Here the chances to get the merges between the upgrade and your own changes is quite poor 😢

One thing you could do also is keep some patch from your changes:
Example: you have upgraded in 1.9, made your changes again, then
something like:

cvs -d :pserver:anonymous@cvs.sourceforge.net/cvsroot/tikiwiki rdiff -r BRANCH-1-9 tiki1.9/ > mytiki.patch

will produce you a patch file you can apply to the same version to get back your changes.
But I would not say this patch applied to a following version makes some difference compared to you update.
Perhaps you could follow the cvs version this way and be ready for a new release, I dont know.
It's nevertheless some "backup" of your changes.

> Every file ... permission set back to "root"
What do you mean?

> PS : Do you thinks that instead of trying to clean the code
> i should redo an update (removing the -q quiet option from cvs command) ?
-q does not change nothing in the upgrade, it's just setting how verbose cvs will be:
-Q > very quiet, -q > quiet, no option --> verbose.

No miracle here !
à+
--
bertrand Gugger
http://toggg.com/