wiki:merge_mdv_cm.sh

The "merge_mdv_cm.sh" script

Objective

Make sure that the latest changes made upstream by the Mandriva developers are integrated in our own versions in our repository, without losing changes already made by us.

Where to get it

The script is in the SVN caixamagica repository at:

merge_mdv_cm.sh

To use it you should check it out with the following command:

svn co http://contribsoft.caixamagica.pt/repo/caixamagica/scripts/merge_mdv_cm.sh

Usage

You must have the "svk" package installed in your system.

merge_mdv_cm.sh <repository_dir> [--domerge]

merge_mdv_cm.sh --clean

Example:

merge_mdv_cm.sh soft/build_system/account_management

This will try to merge the soft/build_system/account_management repository from mandriva with the same repository in the Caixa Magica server.

No actual change will be made in the Caixa Magica repository, this way you can resolve any conflicts that arouse.

merge_mdv_cm.sh soft/build_system/account_management --domerge

This will do the actual merge and will update the Caixa Magica SVN repository

TO DO's

The merging has many problems, the Caixa Magica changes seem to be lost and only the latest mandriva version will remain, which is not what we want.

Consider this script a very early alpha version.

Last modified 11 years ago Last modified on Aug 9, 2007, 12:36:02 PM