source:
vendors/update_EXTERNAL_agrif.sh
@
1984
Last change on this file since 1984 was 1984, checked in by flavoni, 14 years ago | |
---|---|
|
|
File size: 1.6 KB |
Line | |
---|---|
1 | #!/bin/bash |
2 | |
3 | set -x |
4 | |
5 | last_version=$1 |
6 | new_version=$2 |
7 | new_version_name=$3 |
8 | name=$4 |
9 | |
10 | #- My projet url |
11 | svn_repo_url=svn+ssh://$name@forge.ipsl.jussieu.fr/ipsl/forge/projets/mentor/svn/ |
12 | |
13 | #- EXTERNAL directory in which we want to merge vendors |
14 | svn_external=svn+ssh://$name@forge.ipsl.jussieu.fr/ipsl/forge/projets/mentor/svn/trunk/NEMOGCM/EXTERNAL |
15 | |
16 | #- Vendor branch |
17 | vendor_branch=AGRIF |
18 | |
19 | #- Vendor project url |
20 | vendor_url=http://forge.ipsl.jussieu.fr/nemo/svn/trunk |
21 | |
22 | merge=1 |
23 | |
24 | if [ $# -ne 4 ]; then |
25 | echo "Usage: $0 old_version_on_vendor new_version_on_remote new_version_name_on_vendor user" |
26 | echo " *_on_vendor is the tag on the local vendor branch " |
27 | echo " *_on_remote is the reference on remote model (revision number only): REVNUMBER" |
28 | exit 1 |
29 | fi |
30 | |
31 | [ ! -d tmp_update_nemo ] && mkdir tmp_update_${vendor_branch} |
32 | tmp_dir=tmp_update_${vendor_branch} |
33 | cd $tmp_dir |
34 | |
35 | svn export -r $new_version $vendor_url/AGRIF r_$new_version |
36 | |
37 | /sw/share/svn/contrib/client-side/svn_load_dirs/svn_load_dirs.pl $svn_repo_url/vendors/$vendor_branch -t r_$new_version_name current r_$new_version |
38 | |
39 | echo "Downloading and extracting AGRIF version $new_version..." |
40 | svn co $svn_external/AGRIF |
41 | |
42 | if [ $merge == '1' ]; then |
43 | svn merge "$svn_repo_url/vendors/$vendor_branch/$last_version" "$svn_repo_url/vendors/$vendor_branch/current" AGRIF |
44 | fi |
45 | |
46 | ## NOTE : after a merge we have conflicts |
47 | ## to resole them it is necessary to do, for example : svn resolved AGRIF/directory with conflits |
48 | |
49 | ## NOTE : if you have a good merge then you have to committ: |
50 | ## cd $tmp_dir/$vendor_branch |
51 | ## svn status ../AGRIF/ |
52 | ## svn ci --username $name --message "merge AGRIF version $new_version_name" |
53 | |
54 | exit 0 |
55 | 1 |
Note: See TracBrowser
for help on using the repository browser.