Changeset 3


Ignore:
Timestamp:
Jun 29, 2007, 6:10:26 PM (12 years ago)
Author:
fasma
Message:

merge_mdv_cm.sh updated

File:
1 edited

Legend:

Unmodified
Added
Removed
  • caixamagica/scripts/merge_mdv_cm.sh

    r1 r3  
    9090        echo "Merging \"$1\" from the latest Mandriva code at $REPO_MDV with the Caixa Mágica repository at $REPO_CM. Please wait..."
    9191        echo
    92         $SVK_BIN smerge -Il /mdvmerge/local/$1 /mdvmerge/mirror/$1
     92        $SVK_BIN smerge -Il /mdvmerge/local/$1_branch /mdvmerge/local/$1
     93        echo "$SVK_BIN smerge -Il -C /mdvmerge/local/$1 /mdvmerge/mirror/$1"
    9394        #cleaning up
    94         $SVK_BIN depotmap -d mdvmerge
    95         rm -rf $TEMP_DIR
     95        #$SVK_BIN depotmap -d mdvmerge
     96        #rm -rf $TEMP_DIR
    9697        echo
    9798        exit 1
     
    150151#Copy remote repository to local
    151152$SVK_BIN cp -p -m "Bridge between /mdvmerge/mirror/$1 and /mdvmerge/local/$1" /mdvmerge/mirror/$1 /mdvmerge/local/$1
     153#Copy local repository to a new branch for merging
     154$SVK_BIN cp -p -m "Create branch for merging between /mdvmerge/local/$1 and /mdvmerge/local/$1_branch" /mdvmerge/local/$1 /mdvmerge/local/$1_branch
    152155echo
    153156
     
    159162rm -rf local_copy/
    160163#Checking out the code
    161 $SVK_BIN co /mdvmerge/local/$1 local_copy
     164$SVK_BIN co /mdvmerge/local/$1_branch local_copy
    162165echo
    163166
     
    187190$SVK_BIN sync /mdvmerge/mirror/$1
    188191# Testing the merge
    189 $SVK_BIN smerge -C -Il /mdvmerge/local/$1 /mdvmerge/mirror/$1
     192$SVK_BIN smerge -C -Il /mdvmerge/local/$1_branch /mdvmerge/local/$1
    190193echo
    191194
Note: See TracChangeset for help on using the changeset viewer.