1 | #!/bin/bash |
---|
2 | # ------------------------------------------------------------------------------ |
---|
3 | # (C) British Crown Copyright 2006-17 Met Office. |
---|
4 | # |
---|
5 | # This file is part of FCM, tools for managing and building source code. |
---|
6 | # |
---|
7 | # FCM is free software: you can redistribute it and/or modify |
---|
8 | # it under the terms of the GNU General Public License as published by |
---|
9 | # the Free Software Foundation, either version 3 of the License, or |
---|
10 | # (at your option) any later version. |
---|
11 | # |
---|
12 | # FCM is distributed in the hope that it will be useful, |
---|
13 | # but WITHOUT ANY WARRANTY; without even the implied warranty of |
---|
14 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
---|
15 | # GNU General Public License for more details. |
---|
16 | # |
---|
17 | # You should have received a copy of the GNU General Public License |
---|
18 | # along with FCM. If not, see <http://www.gnu.org/licenses/>. |
---|
19 | # ------------------------------------------------------------------------------ |
---|
20 | # Basic tests for "fcm conflicts" (tree conflict mode). |
---|
21 | # TODO: The behaviour exhibited by fcm conflicts in this file is wrong. |
---|
22 | #------------------------------------------------------------------------------- |
---|
23 | . $(dirname $0)/test_header |
---|
24 | #------------------------------------------------------------------------------- |
---|
25 | check_svn_version |
---|
26 | tests 33 |
---|
27 | #------------------------------------------------------------------------------- |
---|
28 | setup |
---|
29 | init_repos |
---|
30 | init_branch ctrl $REPOS_URL |
---|
31 | init_branch_wc ren_ren $REPOS_URL |
---|
32 | # Set a special (null) fcm-graphic-merge diff editor. |
---|
33 | export FCM_GRAPHIC_MERGE=fcm-dummy-diff |
---|
34 | cd $TEST_DIR/wc |
---|
35 | #------------------------------------------------------------------------------- |
---|
36 | # Tests fcm conflicts: rename, rename, diff rename, discard local, discard local |
---|
37 | TEST_KEY=$TEST_KEY_BASE-discard-discard |
---|
38 | svn switch -q $ROOT_URL/branches/dev/Share/ctrl |
---|
39 | svn rename -q pro/hello.pro pro/hello.pro.renamed |
---|
40 | svn commit -q -m "Renamed conflict file (local)" |
---|
41 | svn update -q |
---|
42 | echo "Local contents (1)" >>pro/hello.pro.renamed |
---|
43 | svn commit -q -m "Modified conflict file (local)" |
---|
44 | svn update -q |
---|
45 | svn switch -q $ROOT_URL/branches/dev/Share/ren_ren |
---|
46 | echo "Merge contents (1)" >>pro/hello.pro |
---|
47 | svn commit -q -m "Modified conflict file (merge)" |
---|
48 | svn update -q |
---|
49 | svn rename -q pro/hello.pro pro/hello.pro.renamed |
---|
50 | svn commit -q -m "Renamed conflict file (merge)" |
---|
51 | svn update -q |
---|
52 | svn switch -q $ROOT_URL/branches/dev/Share/ctrl |
---|
53 | fcm merge --non-interactive $ROOT_URL/branches/dev/Share/ren_ren >/dev/null |
---|
54 | run_pass "$TEST_KEY" fcm conflicts <<__IN__ |
---|
55 | n |
---|
56 | n |
---|
57 | __IN__ |
---|
58 | sed -i -n "1,8p" $TEST_DIR/"$TEST_KEY.out" |
---|
59 | file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__ |
---|
60 | [info] pro/hello.pro: in tree conflict. |
---|
61 | Locally: renamed to pro/hello.pro.renamed. |
---|
62 | Externally: deleted. |
---|
63 | Answer (y) to accept the local rename. |
---|
64 | Answer (n) to accept the external delete. |
---|
65 | Keep the local version? |
---|
66 | Enter "y" or "n" (or just press <return> for "n") D pro/hello.pro.renamed |
---|
67 | Resolved conflicted state of 'pro/hello.pro' |
---|
68 | __OUT__ |
---|
69 | file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null |
---|
70 | #------------------------------------------------------------------------------- |
---|
71 | # Tests fcm conflicts: rename, rename, diff rename, discard local, discard local (status) |
---|
72 | TEST_KEY=$TEST_KEY_BASE-discard-discard-status |
---|
73 | run_pass "$TEST_KEY" svn status --config-dir=$TEST_DIR/.subversion/ |
---|
74 | file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__ |
---|
75 | M . |
---|
76 | D pro/hello.pro.renamed |
---|
77 | __OUT__ |
---|
78 | file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null |
---|
79 | #------------------------------------------------------------------------------- |
---|
80 | cd $TEST_DIR |
---|
81 | rm -rf $TEST_DIR/wc |
---|
82 | mkdir $TEST_DIR/wc |
---|
83 | svn checkout -q $ROOT_URL/branches/dev/Share/ctrl $TEST_DIR/wc |
---|
84 | cd $TEST_DIR/wc |
---|
85 | #------------------------------------------------------------------------------- |
---|
86 | # Tests fcm conflicts: rename, rename, diff rename, discard local, keep local |
---|
87 | TEST_KEY=$TEST_KEY_BASE-discard-keep |
---|
88 | fcm merge --non-interactive $ROOT_URL/branches/dev/Share/ren_ren >/dev/null |
---|
89 | run_pass "$TEST_KEY" fcm conflicts <<__IN__ |
---|
90 | n |
---|
91 | y |
---|
92 | __IN__ |
---|
93 | sed -i -n "1,8p" $TEST_DIR/"$TEST_KEY.out" |
---|
94 | file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__ |
---|
95 | [info] pro/hello.pro: in tree conflict. |
---|
96 | Locally: renamed to pro/hello.pro.renamed. |
---|
97 | Externally: deleted. |
---|
98 | Answer (y) to accept the local rename. |
---|
99 | Answer (n) to accept the external delete. |
---|
100 | Keep the local version? |
---|
101 | Enter "y" or "n" (or just press <return> for "n") D pro/hello.pro.renamed |
---|
102 | Resolved conflicted state of 'pro/hello.pro' |
---|
103 | __OUT__ |
---|
104 | file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null |
---|
105 | #------------------------------------------------------------------------------- |
---|
106 | # Tests fcm conflicts: rename, rename, diff rename, discard local, keep local (status) |
---|
107 | TEST_KEY=$TEST_KEY_BASE-discard-keep-status |
---|
108 | run_pass "$TEST_KEY" svn status --config-dir=$TEST_DIR/.subversion/ |
---|
109 | file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__ |
---|
110 | M . |
---|
111 | D pro/hello.pro.renamed |
---|
112 | __OUT__ |
---|
113 | file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null |
---|
114 | #------------------------------------------------------------------------------- |
---|
115 | # Tests fcm conflicts: rename, rename, diff rename, discard local, keep local (cat) |
---|
116 | TEST_KEY=$TEST_KEY_BASE-discard-keep-cat |
---|
117 | run_fail "$TEST_KEY" cat pro/hello.pro.renamed |
---|
118 | file_cmp "$TEST_KEY.out" "$TEST_KEY.out" </dev/null |
---|
119 | file_cmp "$TEST_KEY.err" "$TEST_KEY.err" <<__ERR__ |
---|
120 | cat: pro/hello.pro.renamed: No such file or directory |
---|
121 | __ERR__ |
---|
122 | #------------------------------------------------------------------------------- |
---|
123 | cd $TEST_DIR |
---|
124 | rm -rf $TEST_DIR/wc |
---|
125 | mkdir $TEST_DIR/wc |
---|
126 | svn checkout -q $ROOT_URL/branches/dev/Share/ctrl $TEST_DIR/wc |
---|
127 | cd $TEST_DIR/wc |
---|
128 | #------------------------------------------------------------------------------- |
---|
129 | # Tests fcm conflicts: rename, rename, diff rename, keep local, discard local |
---|
130 | TEST_KEY=$TEST_KEY_BASE-keep-discard |
---|
131 | fcm merge --non-interactive $ROOT_URL/branches/dev/Share/ren_ren >/dev/null |
---|
132 | run_pass "$TEST_KEY" fcm conflicts <<__IN__ |
---|
133 | y |
---|
134 | n |
---|
135 | __IN__ |
---|
136 | file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__ |
---|
137 | [info] pro/hello.pro: in tree conflict. |
---|
138 | Locally: renamed to pro/hello.pro.renamed. |
---|
139 | Externally: deleted. |
---|
140 | Answer (y) to accept the local rename. |
---|
141 | Answer (n) to accept the external delete. |
---|
142 | Keep the local version? |
---|
143 | Enter "y" or "n" (or just press <return> for "n") Resolved conflicted state of 'pro/hello.pro' |
---|
144 | [info] pro/hello.pro.renamed: in tree conflict. |
---|
145 | Locally: added. |
---|
146 | Externally: added. |
---|
147 | Answer (y) to keep the local file filename. |
---|
148 | Answer (n) to keep the external file filename. |
---|
149 | Keep the local version? |
---|
150 | Enter "y" or "n" (or just press <return> for "n") Resolved conflicted state of 'pro/hello.pro.renamed' |
---|
151 | __OUT__ |
---|
152 | file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null |
---|
153 | #------------------------------------------------------------------------------- |
---|
154 | # Tests fcm conflicts: rename, rename, diff rename, keep local (status) |
---|
155 | TEST_KEY=$TEST_KEY_BASE-keep-discard-status |
---|
156 | run_pass "$TEST_KEY" svn status --config-dir=$TEST_DIR/.subversion/ |
---|
157 | file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__ |
---|
158 | M . |
---|
159 | M pro/hello.pro.renamed |
---|
160 | __OUT__ |
---|
161 | file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null |
---|
162 | #------------------------------------------------------------------------------- |
---|
163 | # Tests fcm conflicts: rename, rename, diff rename, keep local (cat) |
---|
164 | TEST_KEY=$TEST_KEY_BASE-keep-discard-cat |
---|
165 | run_pass "$TEST_KEY" cat pro/hello.pro.renamed |
---|
166 | file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__ |
---|
167 | PRO HELLO |
---|
168 | END |
---|
169 | Merge contents (1) |
---|
170 | __OUT__ |
---|
171 | file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null |
---|
172 | #------------------------------------------------------------------------------- |
---|
173 | cd $TEST_DIR |
---|
174 | rm -rf $TEST_DIR/wc |
---|
175 | mkdir $TEST_DIR/wc |
---|
176 | svn checkout -q $ROOT_URL/branches/dev/Share/ctrl $TEST_DIR/wc |
---|
177 | cd $TEST_DIR/wc |
---|
178 | #------------------------------------------------------------------------------- |
---|
179 | # Tests fcm conflicts: rename, rename, diff rename, keep local, keep local |
---|
180 | TEST_KEY=$TEST_KEY_BASE-keep-keep |
---|
181 | fcm merge --non-interactive $ROOT_URL/branches/dev/Share/ren_ren >/dev/null |
---|
182 | run_pass "$TEST_KEY" fcm conflicts <<__IN__ |
---|
183 | y |
---|
184 | y |
---|
185 | __IN__ |
---|
186 | file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__ |
---|
187 | [info] pro/hello.pro: in tree conflict. |
---|
188 | Locally: renamed to pro/hello.pro.renamed. |
---|
189 | Externally: deleted. |
---|
190 | Answer (y) to accept the local rename. |
---|
191 | Answer (n) to accept the external delete. |
---|
192 | Keep the local version? |
---|
193 | Enter "y" or "n" (or just press <return> for "n") Resolved conflicted state of 'pro/hello.pro' |
---|
194 | [info] pro/hello.pro.renamed: in tree conflict. |
---|
195 | Locally: added. |
---|
196 | Externally: added. |
---|
197 | Answer (y) to keep the local file filename. |
---|
198 | Answer (n) to keep the external file filename. |
---|
199 | Keep the local version? |
---|
200 | Enter "y" or "n" (or just press <return> for "n") Resolved conflicted state of 'pro/hello.pro.renamed' |
---|
201 | __OUT__ |
---|
202 | file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null |
---|
203 | #------------------------------------------------------------------------------- |
---|
204 | # Tests fcm conflicts: rename, rename, diff rename, keep local, keep local (status) |
---|
205 | TEST_KEY=$TEST_KEY_BASE-keep-keep-status |
---|
206 | run_pass "$TEST_KEY" svn status --config-dir=$TEST_DIR/.subversion/ |
---|
207 | file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__ |
---|
208 | M . |
---|
209 | __OUT__ |
---|
210 | file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null |
---|
211 | #------------------------------------------------------------------------------- |
---|
212 | # Tests fcm conflicts: rename, rename, diff rename, keep local, keep local (cat) |
---|
213 | TEST_KEY=$TEST_KEY_BASE-keep-keep-cat |
---|
214 | run_pass "$TEST_KEY" cat pro/hello.pro.renamed |
---|
215 | file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__ |
---|
216 | PRO HELLO |
---|
217 | END |
---|
218 | Local contents (1) |
---|
219 | __OUT__ |
---|
220 | file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null |
---|
221 | teardown |
---|