Salam,
Okay, let me sum up when I have to do manually to give a better idea of
how to better modify the script (if possible).
#--
# KDE Merge HOWTO
# $Id: KDE-Merge-HOWTO,v 1.1 2003/10/17 12:11:50 elzubeir Exp $
#--
This mini-HOWTO explains how to go about merging the Arabeyes KDE translation
repostiroy with the main KDE CVS repository.
We will work in ~/tmp/ for the purposes of this document.
1. Check out a fresh copy of the Arabeyes translate/kde cvs module.
$ cvs co translate/kde
$ mv translate/kde kde-ae
$ rm -rf translate
Now we have a ~/tmp/kde-ae/ directory with the Arabeyes KDE translations.
2. Check out a fresh from the KDE templates directory (it is assumed that you
are pointing to the correct KDE CVS repository and are logged in)
$ cvs co kde-i18n/templates
$ mv kde-i18n/templates kde-main
$ rm -rf kde-i18n
NOTE: You may also want to move away the kde-main/docs/ directory as it
is no longer a part of the Arabeyes KDE CVS module and will cause
the tran_update.pl script to freak out.
$ mv kde-main/docs kde-docs
3. Check out a copy of the tran_update.pl script from the Arabeyes scripts/
module.
$ cvs co scripts
Now you have everything you need to start working.
4. Run the tran_update.pl script
$ scripts/tran_update.pl -main_dir kde-main -tran_dir kde-ae 1> std.log \
2> err.log
NOTE: It is very important that you redirect the output to files so you
can carefully go through them one by one.
5. Now you have done the merge. BUT! There are always odd-ball files that are
either completely removed, moved around or newly added ones. You need to
find out what those files are.
$ grep REM std.log > removedfiles.log
Then you need to go over the resulting file and grep the filename you
find and append it to the 'removedfiles.log' file.
$ grep somefile >> removedfiles.log
Repeat this process until you have gone through the entire list (normally
not very long).
$ grep \! std.log > newfiles.log
Now what you have is a list of the removed files (and those moved), which
you can find from the 'removedfiles.log' file. You also have the complete
list of the newly added files from 'newfiles.log'.
6. Simply cvs remove and delete files, add the files, as you find them. This
is the most boring and tedious part of the merge, but it must be done.
Voi la! It's over!
--
-------------------------------------------------------
| Mohammed Elzubeir | Visit us at: |
| | http://www.arabeyes.org/ |
| Arabeyes Project | Homepage: |
| Unix the 'right' way | http://fakkir.net/~elzubeir/|
-------------------------------------------------------
Attachment:
pgp00004.pgp
Description: PGP signature