Re: cvs: phpdoc /cs language-snippets.ent /cs/functions domxml.xml openssl.xml satellite.xml xslt.xml /de language-snippets.ent /de/functions
domxml.xml sockets.xml xslt.xml /en language

> Hi Jeroen, > > Would you mind warning me when you do such modifications? > I still have lots of my own modifications to commit, and I was > adding the experimental warning within the doc. > > This would save some laborious re-work... I'm sorry! Usually CVS takes care of this kind of conflicts, but that doesn't work if you changed alot and/or the indendation. What I do when there are changes that interfere with my work, is the following: 1) backup my modified file, and note the version nr. it was based on (1.3 for example) 2) remove the file from my checked out copy, and run cvs update. CVS will now retrieve the official file, v1.4, WITH the interfering changes. 3) I replace my checked out 1.4 with the file with my own modifications. You can now commit, this will revert the 1.3 -> 1.4 changes. In this case, this is okay, I'll re-do my changes then. If you don't want to revert the 1.3->1.4 changes in a similar case, do a cvs diff -r1.3 -r1.4 thefile.xml > /tmp/myfile_13_14.diff and patch that diff to your modified file, either manually or automatically. If you send me by personal email the relevant files, I'll commit it for you. > Best regards, > Damien Seguy > > Jeroen van Wolffelaar Jeroen@A-Eskwadraat.nl http://www.A-Eskwadraat.nl/~jeroen