]>
Commit | Line | Data |
---|---|---|
38ea2ddc | 1 | #!/bin/bash |
2 | # merge kde4@DEVEL with kde4@HEAD - actually it replaces HEAD with DEVEL | |
3 | # so the actual merge must be done earlier manually. | |
4 | # | |
afa24241 | 5 | # Author: Bartosz Świątek (shadzik@pld-linux.org) |
b1f4cc56 | 6 | # |
7 | # TODO: | |
8 | # - find a way to automatically detect whether to merge _all_ patches, or which to merge and which don't | |
38ea2ddc | 9 | |
10 | usage() { | |
11 | echo "Usage: $0 [-b] [-d] [-h] kde4-kdemodule[.spec]" | |
12 | echo "" | |
468e70fd | 13 | echo "-b => move also the branchdiff" |
38ea2ddc | 14 | echo "-d => debug mode \(set +e\)" |
15 | echo "-h => show this help" | |
16 | echo "" | |
17 | exit 1 | |
18 | } | |
19 | ||
20 | BRANCHDIFF=no | |
21 | MODULE=$2 | |
22 | ||
23 | while [ $# -gt 0 ]; do | |
24 | case "$1" in | |
25 | -b ) | |
26 | BRANCHDIFF=yes | |
27 | ;; | |
28 | -d ) | |
29 | set +e | |
30 | ;; | |
31 | -h ) | |
32 | usage | |
33 | ;; | |
34 | -* ) | |
35 | die "Unknown option: $1" | |
36 | ;; | |
37 | * ) # no option, just module | |
38 | MODULE=$1 | |
39 | ;; | |
40 | esac | |
41 | shift | |
42 | done | |
43 | ||
44 | if [ "$MODULE" == "" ]; then | |
45 | usage | |
46 | fi | |
47 | ||
48 | kde4spec=`case "$MODULE" in | |
49 | *.spec ) | |
50 | echo $MODULE | |
51 | ;; | |
52 | * ) | |
53 | echo $MODULE.spec | |
54 | ;; | |
55 | esac` | |
56 | PKG=$(echo $kde4spec |sed -e 's/.spec//g') | |
57 | ||
58 | # start | |
59 | ||
60 | cvs get -r DEVEL packages/$PKG/$kde4spec | |
61 | mv packages/$PKG/$kde4spec /tmp/$kde4spec-dev | |
62 | cvs get packages/$PKG/$kde4spec | |
63 | mv /tmp/$kde4spec-dev packages/$PKG/$kde4spec | |
64 | echo "Changing to stable" | |
65 | sed -i -e 's/unstable/stable/g' packages/$PKG/$kde4spec | |
66 | echo "Done, seding" | |
468e70fd | 67 | cvs ci -m "- moved from DEVEL" packages/$PKG/$kde4spec |
38ea2ddc | 68 | echo "Deleting DEVEL branch from spec" |
69 | cvs tag -B -d DEVEL packages/$PKG/$kde4spec | |
70 | ||
71 | if [ "x$BRANCHDIFF" == "xyes" ]; then | |
72 | cvs get -r DEVEL packages/$PKG/$PKG-branch.diff | |
73 | mv packages/$PKG/$PKG-branch.diff /tmp/$PKG-branch.diff-dev | |
74 | cvs get packages/$PKG/$PKG-branch.diff | |
75 | mv /tmp/$PKG-branch.diff-dev packages/$PKG/$PKG-branch.diff | |
468e70fd | 76 | cvs ci -m "- moved from DEVEL" packages/$PKG/$PKG-branch.diff |
38ea2ddc | 77 | echo "Deleting DEVEL branch from branchdiff" |
78 | cvs tag -B -d DEVEL packages/$PKG/$PKG-branch.diff | |
79 | fi |