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 | # More complex tests for "fcm merge". |
---|
21 | #------------------------------------------------------------------------------- |
---|
22 | . $(dirname $0)/test_header |
---|
23 | #------------------------------------------------------------------------------- |
---|
24 | check_svn_version |
---|
25 | tests 234 |
---|
26 | #------------------------------------------------------------------------------- |
---|
27 | setup |
---|
28 | init_repos |
---|
29 | init_merge_branches merge1 merge2 $REPOS_URL |
---|
30 | export SVN_EDITOR="sed -i 1i\foo" |
---|
31 | cd $TEST_DIR/wc |
---|
32 | svn switch -q $ROOT_URL/branches/dev/Share/merge1 |
---|
33 | #------------------------------------------------------------------------------- |
---|
34 | # Test the various mergeinfo output before merging. |
---|
35 | test_mergeinfo "$TEST_KEY_BASE-trunk-into-branch-1-pre" \ |
---|
36 | $ROOT_URL/trunk - 9 <<__RESULTS__ |
---|
37 | begin-prop |
---|
38 | end-prop |
---|
39 | begin-info |
---|
40 | youngest common ancestor |
---|
41 | | last full merge |
---|
42 | | | tip of branch |
---|
43 | | | | repository path |
---|
44 | |
---|
45 | 1 9 |
---|
46 | | | |
---|
47 | -------| |------------ trunk |
---|
48 | \ |
---|
49 | \ |
---|
50 | --| |------------ branches/dev/Share/merge1 |
---|
51 | | |
---|
52 | WC |
---|
53 | end-info |
---|
54 | begin-eligible |
---|
55 | r8 |
---|
56 | r9 |
---|
57 | end-eligible |
---|
58 | begin-merged |
---|
59 | end-merged |
---|
60 | __RESULTS__ |
---|
61 | #------------------------------------------------------------------------------- |
---|
62 | # Tests fcm merge of trunk-into-branch (1) |
---|
63 | TEST_KEY=$TEST_KEY_BASE-trunk-into-branch-1-non-root |
---|
64 | cd module |
---|
65 | run_pass "$TEST_KEY" fcm merge --non-interactive trunk |
---|
66 | file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__ |
---|
67 | $TEST_DIR/wc: working directory changed to top of working copy. |
---|
68 | Eligible merge(s) from /${PROJECT}trunk@9: 9 8 |
---|
69 | -------------------------------------------------------------------------------- |
---|
70 | Merge: /${PROJECT}trunk@9 |
---|
71 | c.f.: /${PROJECT}trunk@1 |
---|
72 | Merge succeeded. |
---|
73 | --------------------------------------------------------------------------actual |
---|
74 | --- Merging r2 through r9 into '.': |
---|
75 | U lib/python/info/__init__.py |
---|
76 | --- Recording mergeinfo for merge of r2 through r9 into '.': |
---|
77 | U . |
---|
78 | --------------------------------------------------------------------------actual |
---|
79 | __OUT__ |
---|
80 | file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null |
---|
81 | cd .. |
---|
82 | #------------------------------------------------------------------------------- |
---|
83 | # Tests svn status result of fcm merge (1) |
---|
84 | TEST_KEY=$TEST_KEY_BASE-trunk-into-branch-1-status |
---|
85 | run_pass "$TEST_KEY" svn status --config-dir=$TEST_DIR/.subversion/ |
---|
86 | status_sort "$TEST_DIR/$TEST_KEY.out" "$TEST_DIR/$TEST_KEY.sorted.out" |
---|
87 | file_cmp "$TEST_KEY.sorted.out" "$TEST_KEY.sorted.out" <<__OUT__ |
---|
88 | M . |
---|
89 | ? unversioned_file |
---|
90 | M lib/python/info/__init__.py |
---|
91 | __OUT__ |
---|
92 | file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null |
---|
93 | #------------------------------------------------------------------------------- |
---|
94 | # Tests svn diff result of fcm merge (1) |
---|
95 | TEST_KEY=$TEST_KEY_BASE-trunk-into-branch-1-diff |
---|
96 | run_pass "$TEST_KEY" svn diff |
---|
97 | diff_sort "$TEST_DIR/$TEST_KEY.out" "$TEST_DIR/$TEST_KEY.sorted.out" |
---|
98 | diff_svn_version_filter >"$TEST_DIR/$TEST_KEY.sorted.ctrl" <<__OUT__ |
---|
99 | |
---|
100 | Index: . |
---|
101 | =================================================================== |
---|
102 | --- . (revision 9) |
---|
103 | +++ . (working copy) |
---|
104 | |
---|
105 | Property changes on: . |
---|
106 | ___________________________________________________________________ |
---|
107 | Added: svn:mergeinfo |
---|
108 | #IF SVN1.9 ## -0,0 +0,1 ## |
---|
109 | Merged /${PROJECT}trunk:r2-9 |
---|
110 | Index: lib/python/info/__init__.py |
---|
111 | =================================================================== |
---|
112 | --- lib/python/info/__init__.py (revision 9) |
---|
113 | +++ lib/python/info/__init__.py (working copy) |
---|
114 | @@ -0,0 +1,2 @@ |
---|
115 | +trunk change |
---|
116 | +another trunk change |
---|
117 | __OUT__ |
---|
118 | file_cmp "$TEST_KEY.sorted.out" "$TEST_KEY.sorted.out" \ |
---|
119 | "$TEST_DIR/$TEST_KEY.sorted.ctrl" |
---|
120 | file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null |
---|
121 | #------------------------------------------------------------------------------- |
---|
122 | # Tests fcm commit of fcm merge (1) |
---|
123 | TEST_KEY=$TEST_KEY_BASE-trunk-into-branch-1-commit |
---|
124 | run_pass "$TEST_KEY" fcm commit <<__IN__ |
---|
125 | y |
---|
126 | __IN__ |
---|
127 | commit_sort "$TEST_DIR/$TEST_KEY.out" "$TEST_DIR/$TEST_KEY.sorted.out" |
---|
128 | file_cmp "$TEST_KEY.sorted.out" "$TEST_KEY.sorted.out" <<__OUT__ |
---|
129 | [info] sed -i 1i\foo: starting commit message editor... |
---|
130 | Change summary: |
---|
131 | -------------------------------------------------------------------------------- |
---|
132 | [Root : $REPOS_URL] |
---|
133 | [Project: ${TEST_PROJECT:-}] |
---|
134 | [Branch : branches/dev/Share/merge1] |
---|
135 | [Sub-dir: ] |
---|
136 | M . |
---|
137 | M lib/python/info/__init__.py |
---|
138 | -------------------------------------------------------------------------------- |
---|
139 | Commit message is as follows: |
---|
140 | -------------------------------------------------------------------------------- |
---|
141 | foo |
---|
142 | Merged into /${PROJECT}branches/dev/Share/merge1: /${PROJECT}trunk@9 cf. /${PROJECT}trunk@1 |
---|
143 | -------------------------------------------------------------------------------- |
---|
144 | *** WARNING: YOU ARE COMMITTING TO A Share BRANCH. |
---|
145 | *** Please ensure that you have the owner's permission. |
---|
146 | Would you like to commit this change? |
---|
147 | Enter "y" or "n" (or just press <return> for "n"): Sending . |
---|
148 | Sending lib/python/info/__init__.py |
---|
149 | Committed revision 10. |
---|
150 | Updating '.': |
---|
151 | At revision 10. |
---|
152 | __OUT__ |
---|
153 | file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null |
---|
154 | #------------------------------------------------------------------------------- |
---|
155 | # Tests fcm log of fcm merge (1) |
---|
156 | TEST_KEY=$TEST_KEY_BASE-trunk-into-branch-1-log |
---|
157 | run_pass "$TEST_KEY" fcm log |
---|
158 | sed -i "s/\(.*|.*|\).*\(|.*\)$/\1 date \2/g" $TEST_DIR/$TEST_KEY.out |
---|
159 | file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__ |
---|
160 | ------------------------------------------------------------------------ |
---|
161 | r10 | $LOGNAME | date | 3 lines |
---|
162 | |
---|
163 | foo |
---|
164 | Merged into /${PROJECT}branches/dev/Share/merge1: /${PROJECT}trunk@9 cf. /${PROJECT}trunk@1 |
---|
165 | |
---|
166 | ------------------------------------------------------------------------ |
---|
167 | r5 | $LOGNAME | date | 1 line |
---|
168 | |
---|
169 | Made changes for future merge of this branch |
---|
170 | ------------------------------------------------------------------------ |
---|
171 | r4 | $LOGNAME | date | 1 line |
---|
172 | |
---|
173 | Made a branch Created /${PROJECT}branches/dev/Share/merge1 from /trunk@1. |
---|
174 | ------------------------------------------------------------------------ |
---|
175 | r1 | $LOGNAME | date | 1 line |
---|
176 | |
---|
177 | initial trunk import |
---|
178 | ------------------------------------------------------------------------ |
---|
179 | __OUT__ |
---|
180 | file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null |
---|
181 | #------------------------------------------------------------------------------- |
---|
182 | # Test the various mergeinfo output after merging. |
---|
183 | test_mergeinfo "$TEST_KEY_BASE-trunk-into-branch-1-post" \ |
---|
184 | $ROOT_URL/trunk - 10 <<__RESULTS__ |
---|
185 | begin-prop |
---|
186 | /trunk:2-9 |
---|
187 | end-prop |
---|
188 | begin-info |
---|
189 | youngest common ancestor |
---|
190 | | last full merge |
---|
191 | | | tip of branch |
---|
192 | | | | repository path |
---|
193 | |
---|
194 | 1 9 10 |
---|
195 | | | | |
---|
196 | -------| |------------ trunk |
---|
197 | \ \ |
---|
198 | \ \ |
---|
199 | --| |------------ branches/dev/Share/merge1 |
---|
200 | | |
---|
201 | WC |
---|
202 | end-info |
---|
203 | begin-eligible |
---|
204 | end-eligible |
---|
205 | begin-merged |
---|
206 | r8 |
---|
207 | r9 |
---|
208 | end-merged |
---|
209 | __RESULTS__ |
---|
210 | #------------------------------------------------------------------------------- |
---|
211 | # Tests fcm merge of branch-into-trunk (1) |
---|
212 | TEST_KEY=$TEST_KEY_BASE-branch-into-trunk-1 |
---|
213 | BRANCH_MOD_FILE="added_directory/hello_constants_dummy.inc" |
---|
214 | echo "# added this line for simple repeat testing" >>$BRANCH_MOD_FILE |
---|
215 | svn commit -q -m "edit on branch for merge repeat test" |
---|
216 | svn update -q |
---|
217 | cd $TEST_DIR |
---|
218 | rm -rf $TEST_DIR/wc |
---|
219 | mkdir $TEST_DIR/wc |
---|
220 | svn checkout -q $ROOT_URL/trunk $TEST_DIR/wc |
---|
221 | cd $TEST_DIR/wc |
---|
222 | #------------------------------------------------------------------------------- |
---|
223 | # Test the various mergeinfo output before merging. |
---|
224 | test_mergeinfo "$TEST_KEY_BASE-branch-into-trunk-1-pre" \ |
---|
225 | $ROOT_URL/branches/dev/Share/merge1 - 11 <<__RESULTS__ |
---|
226 | begin-prop |
---|
227 | end-prop |
---|
228 | begin-info |
---|
229 | youngest common ancestor |
---|
230 | | last full merge |
---|
231 | | | tip of branch |
---|
232 | | | | repository path |
---|
233 | |
---|
234 | 1 11 |
---|
235 | | | |
---|
236 | --| |------------ branches/dev/Share/merge1 |
---|
237 | / / |
---|
238 | / / |
---|
239 | -------| |------------ trunk |
---|
240 | | | |
---|
241 | 9 WC |
---|
242 | end-info |
---|
243 | begin-eligible |
---|
244 | r5 |
---|
245 | r10 |
---|
246 | r11 |
---|
247 | end-eligible |
---|
248 | begin-merged |
---|
249 | end-merged |
---|
250 | __RESULTS__ |
---|
251 | #------------------------------------------------------------------------------- |
---|
252 | TEST_KEY=$TEST_KEY_BASE-branch-into-trunk-1 |
---|
253 | run_pass "$TEST_KEY" fcm merge --non-interactive branches/dev/Share/merge1 |
---|
254 | merge_sort "$TEST_DIR/$TEST_KEY.out" "$TEST_DIR/$TEST_KEY.sorted.out" |
---|
255 | file_cmp "$TEST_KEY.sorted.out" "$TEST_KEY.sorted.out" <<__OUT__ |
---|
256 | Eligible merge(s) from /${PROJECT}branches/dev/Share/merge1@11: 11 10 |
---|
257 | -------------------------------------------------------------------------------- |
---|
258 | Merge: /${PROJECT}branches/dev/Share/merge1@11 |
---|
259 | c.f.: /${PROJECT}trunk@9 |
---|
260 | Merge succeeded. |
---|
261 | --------------------------------------------------------------------------actual |
---|
262 | --- Merging differences between repository URLs into '.': |
---|
263 | A added_directory |
---|
264 | A added_directory/hello_constants.f90 |
---|
265 | A added_directory/hello_constants.inc |
---|
266 | A added_directory/hello_constants_dummy.inc |
---|
267 | A added_file |
---|
268 | A module/tree_conflict_file |
---|
269 | U lib/python/info/poems.py |
---|
270 | U module/hello_constants.f90 |
---|
271 | U module/hello_constants.inc |
---|
272 | U module/hello_constants_dummy.inc |
---|
273 | U subroutine/hello_sub_dummy.h |
---|
274 | --- Recording mergeinfo for merge between repository URLs into '.': |
---|
275 | U . |
---|
276 | --------------------------------------------------------------------------actual |
---|
277 | __OUT__ |
---|
278 | file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null |
---|
279 | #------------------------------------------------------------------------------- |
---|
280 | # Tests svn status result of fcm merge (1) |
---|
281 | TEST_KEY=$TEST_KEY_BASE-branch-into-trunk-1-status |
---|
282 | run_pass "$TEST_KEY" svn status --config-dir=$TEST_DIR/.subversion/ |
---|
283 | status_sort "$TEST_DIR/$TEST_KEY.out" "$TEST_DIR/$TEST_KEY.sorted.out" |
---|
284 | file_cmp "$TEST_KEY.sorted.out" "$TEST_KEY.sorted.out" <<__OUT__ |
---|
285 | M . |
---|
286 | A + added_directory |
---|
287 | A + added_file |
---|
288 | A + module/tree_conflict_file |
---|
289 | M lib/python/info/poems.py |
---|
290 | M module/hello_constants.f90 |
---|
291 | M module/hello_constants.inc |
---|
292 | M module/hello_constants_dummy.inc |
---|
293 | M subroutine/hello_sub_dummy.h |
---|
294 | __OUT__ |
---|
295 | file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null |
---|
296 | #------------------------------------------------------------------------------- |
---|
297 | # Tests svn diff result of fcm merge (1) |
---|
298 | TEST_KEY=$TEST_KEY_BASE-branch-into-trunk-1-diff |
---|
299 | run_pass "$TEST_KEY" svn diff |
---|
300 | diff_sort "$TEST_DIR/$TEST_KEY.out" "$TEST_DIR/$TEST_KEY.sorted.out" |
---|
301 | diff_svn_version_filter >"$TEST_DIR/$TEST_KEY.sorted.ctrl" <<__OUT__ |
---|
302 | |
---|
303 | Index: . |
---|
304 | =================================================================== |
---|
305 | --- . (revision 11) |
---|
306 | +++ . (working copy) |
---|
307 | |
---|
308 | Property changes on: . |
---|
309 | ___________________________________________________________________ |
---|
310 | Added: svn:mergeinfo |
---|
311 | #IF SVN1.9 ## -0,0 +0,1 ## |
---|
312 | Merged /${PROJECT}branches/dev/Share/merge1:r4-11 |
---|
313 | #IF SVN1.9 Index: added_directory/hello_constants.f90 |
---|
314 | #IF SVN1.9 =================================================================== |
---|
315 | #IF SVN1.9 Index: added_directory/hello_constants.inc |
---|
316 | #IF SVN1.9 =================================================================== |
---|
317 | #IF SVN1.9 Index: added_directory/hello_constants_dummy.inc |
---|
318 | #IF SVN1.9 =================================================================== |
---|
319 | #IF SVN1.9 Index: added_file |
---|
320 | #IF SVN1.9 =================================================================== |
---|
321 | Index: lib/python/info/poems.py |
---|
322 | =================================================================== |
---|
323 | --- lib/python/info/poems.py (revision 11) |
---|
324 | +++ lib/python/info/poems.py (working copy) |
---|
325 | @@ -1,24 +1,23 @@ |
---|
326 | -#!/usr/bin/env python |
---|
327 | -# -*- coding: utf-8 -*- |
---|
328 | """The Python, by Hilaire Belloc |
---|
329 | |
---|
330 | A Python I should not advise,-- |
---|
331 | -It needs a doctor for its eyes, |
---|
332 | +It needs a doctor FOR its eyes, |
---|
333 | And has the measles yearly. |
---|
334 | -However, if you feel inclined |
---|
335 | -To get one (to improve your mind, |
---|
336 | +However, if you feel INclINed |
---|
337 | +To get one ( |
---|
338 | +to improve your mINd, |
---|
339 | And not from fashion merely), |
---|
340 | Allow no music near its cage; |
---|
341 | -And when it flies into a rage |
---|
342 | +And when it flies INto a rage |
---|
343 | Chastise it, most severely. |
---|
344 | -I had an aunt in Yucatan |
---|
345 | +I had an aunt IN Yucatan |
---|
346 | Who bought a Python from a man |
---|
347 | -And kept it for a pet. |
---|
348 | +And kept it FOR a pet. |
---|
349 | She died, because she never knew |
---|
350 | These simple little rules and few;-- |
---|
351 | -The Snake is living yet. |
---|
352 | +The Snake is livINg yet. |
---|
353 | """ |
---|
354 | |
---|
355 | import this |
---|
356 | |
---|
357 | -print "\n", __doc__ |
---|
358 | +prINt "\n", __doc__ |
---|
359 | Index: module/hello_constants.f90 |
---|
360 | =================================================================== |
---|
361 | --- module/hello_constants.f90 (revision 11) |
---|
362 | +++ module/hello_constants.f90 (working copy) |
---|
363 | @@ -1,5 +1,5 @@ |
---|
364 | MODULE Hello_Constants |
---|
365 | |
---|
366 | -INCLUDE 'hello_constants_dummy.inc' |
---|
367 | +INCLUDE 'hello_constants_dummy.INc' |
---|
368 | |
---|
369 | END MODULE Hello_Constants |
---|
370 | Index: module/hello_constants.inc |
---|
371 | =================================================================== |
---|
372 | --- module/hello_constants.inc (revision 11) |
---|
373 | +++ module/hello_constants.inc (working copy) |
---|
374 | @@ -1 +1,2 @@ |
---|
375 | -CHARACTER (LEN=80), PARAMETER :: hello_string = 'Hello Earth!' |
---|
376 | +CHARACTER ( |
---|
377 | +LEN=80), PARAMETER :: hello_strINg = 'Hello Earth!!' |
---|
378 | Index: module/hello_constants_dummy.inc |
---|
379 | =================================================================== |
---|
380 | --- module/hello_constants_dummy.inc (revision 11) |
---|
381 | +++ module/hello_constants_dummy.inc (working copy) |
---|
382 | @@ -1 +1 @@ |
---|
383 | -INCLUDE 'hello_constants.inc' |
---|
384 | +INCLUDE 'hello_constants.INc' |
---|
385 | #IF SVN1.9 Index: module/tree_conflict_file |
---|
386 | #IF SVN1.9 =================================================================== |
---|
387 | Index: subroutine/hello_sub_dummy.h |
---|
388 | =================================================================== |
---|
389 | --- subroutine/hello_sub_dummy.h (revision 11) |
---|
390 | +++ subroutine/hello_sub_dummy.h (working copy) |
---|
391 | @@ -1 +1,2 @@ |
---|
392 | #include "hello_sub.h" |
---|
393 | +Modified a line |
---|
394 | __OUT__ |
---|
395 | file_cmp "$TEST_KEY.sorted.out" "$TEST_KEY.sorted.out" \ |
---|
396 | "$TEST_DIR/$TEST_KEY.sorted.ctrl" |
---|
397 | file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null |
---|
398 | #------------------------------------------------------------------------------- |
---|
399 | # Tests fcm commit of fcm merge (1) |
---|
400 | TEST_KEY=$TEST_KEY_BASE-branch-into-trunk-1-commit |
---|
401 | run_pass "$TEST_KEY" fcm commit <<__IN__ |
---|
402 | y |
---|
403 | __IN__ |
---|
404 | commit_sort "$TEST_DIR/$TEST_KEY.out" "$TEST_DIR/$TEST_KEY.sorted.out" |
---|
405 | file_cmp "$TEST_KEY.sorted.out" "$TEST_KEY.sorted.out" <<__OUT__ |
---|
406 | [info] sed -i 1i\foo: starting commit message editor... |
---|
407 | Change summary: |
---|
408 | -------------------------------------------------------------------------------- |
---|
409 | [Root : $REPOS_URL] |
---|
410 | [Project: ${TEST_PROJECT:-}] |
---|
411 | [Branch : trunk] |
---|
412 | [Sub-dir: ] |
---|
413 | M . |
---|
414 | A + added_directory |
---|
415 | A + added_file |
---|
416 | A + module/tree_conflict_file |
---|
417 | M lib/python/info/poems.py |
---|
418 | M module/hello_constants.f90 |
---|
419 | M module/hello_constants.inc |
---|
420 | M module/hello_constants_dummy.inc |
---|
421 | M subroutine/hello_sub_dummy.h |
---|
422 | -------------------------------------------------------------------------------- |
---|
423 | Commit message is as follows: |
---|
424 | -------------------------------------------------------------------------------- |
---|
425 | foo |
---|
426 | Merged into /${PROJECT}trunk: /${PROJECT}branches/dev/Share/merge1@11 cf. /${PROJECT}trunk@9 |
---|
427 | -------------------------------------------------------------------------------- |
---|
428 | *** WARNING: YOU ARE COMMITTING TO THE TRUNK. |
---|
429 | *** Please ensure that your change conforms to your project's working practices. |
---|
430 | Would you like to commit this change? |
---|
431 | Enter "y" or "n" (or just press <return> for "n"): Sending . |
---|
432 | Adding added_directory |
---|
433 | Adding added_file |
---|
434 | Adding module/tree_conflict_file |
---|
435 | Sending lib/python/info/poems.py |
---|
436 | Sending module/hello_constants.f90 |
---|
437 | Sending module/hello_constants.inc |
---|
438 | Sending module/hello_constants_dummy.inc |
---|
439 | Sending subroutine/hello_sub_dummy.h |
---|
440 | Committed revision 12. |
---|
441 | Updating '.': |
---|
442 | At revision 12. |
---|
443 | __OUT__ |
---|
444 | file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null |
---|
445 | #------------------------------------------------------------------------------- |
---|
446 | # Tests fcm log of fcm merge branch-into-trunk (1) |
---|
447 | TEST_KEY=$TEST_KEY_BASE-branch-into-trunk-1-log |
---|
448 | run_pass "$TEST_KEY" fcm log |
---|
449 | sed -i "s/\(.*|.*|\).*\(|.*\)$/\1 date \2/g" $TEST_DIR/$TEST_KEY.out |
---|
450 | file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__ |
---|
451 | ------------------------------------------------------------------------ |
---|
452 | r12 | $LOGNAME | date | 3 lines |
---|
453 | |
---|
454 | foo |
---|
455 | Merged into /${PROJECT}trunk: /${PROJECT}branches/dev/Share/merge1@11 cf. /${PROJECT}trunk@9 |
---|
456 | |
---|
457 | ------------------------------------------------------------------------ |
---|
458 | r9 | $LOGNAME | date | 1 line |
---|
459 | |
---|
460 | Made another trunk change |
---|
461 | ------------------------------------------------------------------------ |
---|
462 | r8 | $LOGNAME | date | 1 line |
---|
463 | |
---|
464 | Made trunk change |
---|
465 | ------------------------------------------------------------------------ |
---|
466 | r1 | $LOGNAME | date | 1 line |
---|
467 | |
---|
468 | initial trunk import |
---|
469 | ------------------------------------------------------------------------ |
---|
470 | __OUT__ |
---|
471 | file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null |
---|
472 | #------------------------------------------------------------------------------- |
---|
473 | # Test the various mergeinfo output after merging. |
---|
474 | test_mergeinfo "$TEST_KEY_BASE-branch-into-trunk-1-post" \ |
---|
475 | $ROOT_URL/branches/dev/Share/merge1 - 12 <<__RESULTS__ |
---|
476 | begin-prop |
---|
477 | /branches/dev/Share/merge1:4-11 |
---|
478 | end-prop |
---|
479 | begin-info |
---|
480 | youngest common ancestor |
---|
481 | | last full merge |
---|
482 | | | tip of branch |
---|
483 | | | | repository path |
---|
484 | |
---|
485 | 1 11 12 |
---|
486 | | | | |
---|
487 | --| |------------ branches/dev/Share/merge1 |
---|
488 | / \ |
---|
489 | / \ |
---|
490 | -------| |------------ trunk |
---|
491 | | |
---|
492 | WC |
---|
493 | end-info |
---|
494 | begin-eligible |
---|
495 | end-eligible |
---|
496 | begin-merged |
---|
497 | r4 |
---|
498 | r5 |
---|
499 | r10 |
---|
500 | r11 |
---|
501 | end-merged |
---|
502 | __RESULTS__ |
---|
503 | #------------------------------------------------------------------------------- |
---|
504 | # Tests fcm merge of branch-into-trunk (2) |
---|
505 | svn switch -q $ROOT_URL/branches/dev/Share/merge1 |
---|
506 | MOD_FILE="added_file" |
---|
507 | echo "call_extra_feature()" >>$MOD_FILE |
---|
508 | svn commit -q -m "Made branch change to add extra feature" |
---|
509 | svn update -q |
---|
510 | # Create a new branch to up the revision number, as a test. |
---|
511 | init_branch merge3 $REPOS_URL |
---|
512 | # Checkout the trunk. |
---|
513 | svn switch -q $ROOT_URL/trunk |
---|
514 | #------------------------------------------------------------------------------- |
---|
515 | # Test the various mergeinfo output before merging. |
---|
516 | test_mergeinfo "$TEST_KEY_BASE-branch-into-trunk-2-pre" \ |
---|
517 | $ROOT_URL/branches/dev/Share/merge1 - 14 <<__RESULTS__ |
---|
518 | begin-prop |
---|
519 | /branches/dev/Share/merge1:4-11 |
---|
520 | end-prop |
---|
521 | begin-info |
---|
522 | youngest common ancestor |
---|
523 | | last full merge |
---|
524 | | | tip of branch |
---|
525 | | | | repository path |
---|
526 | |
---|
527 | 1 11 14 |
---|
528 | | | | |
---|
529 | --| |------------ branches/dev/Share/merge1 |
---|
530 | / \ |
---|
531 | / \ |
---|
532 | -------| |------------ trunk |
---|
533 | | |
---|
534 | WC |
---|
535 | end-info |
---|
536 | begin-eligible |
---|
537 | r13 |
---|
538 | end-eligible |
---|
539 | begin-merged |
---|
540 | r4 |
---|
541 | r5 |
---|
542 | r10 |
---|
543 | r11 |
---|
544 | end-merged |
---|
545 | __RESULTS__ |
---|
546 | #------------------------------------------------------------------------------- |
---|
547 | TEST_KEY=$TEST_KEY_BASE-branch-into-trunk-2 |
---|
548 | run_pass "$TEST_KEY" fcm merge --non-interactive branches/dev/Share/merge1 |
---|
549 | file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__ |
---|
550 | Eligible merge(s) from /${PROJECT}branches/dev/Share/merge1@14: 13 |
---|
551 | -------------------------------------------------------------------------------- |
---|
552 | Merge: /${PROJECT}branches/dev/Share/merge1@13 |
---|
553 | c.f.: /${PROJECT}branches/dev/Share/merge1@11 |
---|
554 | Merge succeeded. |
---|
555 | --------------------------------------------------------------------------actual |
---|
556 | --- Merging r12 through r13 into '.': |
---|
557 | U added_file |
---|
558 | --- Recording mergeinfo for merge of r12 through r13 into '.': |
---|
559 | U . |
---|
560 | --------------------------------------------------------------------------actual |
---|
561 | __OUT__ |
---|
562 | file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null |
---|
563 | #------------------------------------------------------------------------------- |
---|
564 | # Tests svn status result of fcm merge branch-into-trunk (2) |
---|
565 | TEST_KEY=$TEST_KEY_BASE-branch-into-trunk-2-status |
---|
566 | run_pass "$TEST_KEY" svn status --config-dir=$TEST_DIR/.subversion/ |
---|
567 | file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__ |
---|
568 | M . |
---|
569 | M added_file |
---|
570 | __OUT__ |
---|
571 | file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null |
---|
572 | #------------------------------------------------------------------------------- |
---|
573 | # Tests svn diff result of fcm merge branch-into-trunk (2) |
---|
574 | TEST_KEY=$TEST_KEY_BASE-branch-into-trunk-2-diff |
---|
575 | run_pass "$TEST_KEY" svn diff |
---|
576 | diff_sort "$TEST_DIR/$TEST_KEY.out" "$TEST_DIR/$TEST_KEY.sorted.out" |
---|
577 | diff_svn_version_filter >"$TEST_DIR/$TEST_KEY.sorted.ctrl" <<__OUT__ |
---|
578 | |
---|
579 | Index: . |
---|
580 | =================================================================== |
---|
581 | --- . (revision 14) |
---|
582 | +++ . (working copy) |
---|
583 | |
---|
584 | Property changes on: . |
---|
585 | ___________________________________________________________________ |
---|
586 | Modified: svn:mergeinfo |
---|
587 | #IF SVN1.9 ## -0,0 +0,1 ## |
---|
588 | Merged /${PROJECT}branches/dev/Share/merge1:r12-13 |
---|
589 | Index: added_file |
---|
590 | =================================================================== |
---|
591 | --- added_file (revision 14) |
---|
592 | +++ added_file (working copy) |
---|
593 | @@ -1 +1,2 @@ |
---|
594 | INCLUDE 'hello_constants.INc' |
---|
595 | +call_extra_feature() |
---|
596 | __OUT__ |
---|
597 | file_cmp "$TEST_KEY.sorted.out" "$TEST_KEY.sorted.out" \ |
---|
598 | "$TEST_DIR/$TEST_KEY.sorted.ctrl" |
---|
599 | file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null |
---|
600 | #------------------------------------------------------------------------------- |
---|
601 | # Tests fcm commit of fcm merge branch-into-trunk (2) |
---|
602 | TEST_KEY=$TEST_KEY_BASE-branch-into-trunk-2-commit |
---|
603 | run_pass "$TEST_KEY" fcm commit <<__IN__ |
---|
604 | y |
---|
605 | __IN__ |
---|
606 | sed -i "/^Updating '.':$/d" "$TEST_DIR/$TEST_KEY.out" |
---|
607 | commit_sort "$TEST_DIR/$TEST_KEY.out" "$TEST_DIR/$TEST_KEY.sorted.out" |
---|
608 | file_cmp "$TEST_KEY.sorted.out" "$TEST_KEY.sorted.out" <<__OUT__ |
---|
609 | [info] sed -i 1i\foo: starting commit message editor... |
---|
610 | Change summary: |
---|
611 | -------------------------------------------------------------------------------- |
---|
612 | [Root : $REPOS_URL] |
---|
613 | [Project: ${TEST_PROJECT:-}] |
---|
614 | [Branch : trunk] |
---|
615 | [Sub-dir: ] |
---|
616 | M . |
---|
617 | M added_file |
---|
618 | -------------------------------------------------------------------------------- |
---|
619 | Commit message is as follows: |
---|
620 | -------------------------------------------------------------------------------- |
---|
621 | foo |
---|
622 | Merged into /${PROJECT}trunk: /${PROJECT}branches/dev/Share/merge1@13 cf. /${PROJECT}branches/dev/Share/merge1@11 |
---|
623 | -------------------------------------------------------------------------------- |
---|
624 | *** WARNING: YOU ARE COMMITTING TO THE TRUNK. |
---|
625 | *** Please ensure that your change conforms to your project's working practices. |
---|
626 | Would you like to commit this change? |
---|
627 | Enter "y" or "n" (or just press <return> for "n"): Sending . |
---|
628 | Sending added_file |
---|
629 | Committed revision 15. |
---|
630 | At revision 15. |
---|
631 | __OUT__ |
---|
632 | file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null |
---|
633 | #------------------------------------------------------------------------------- |
---|
634 | # Tests fcm log of fcm merge branch-into-trunk (2) |
---|
635 | TEST_KEY=$TEST_KEY_BASE-branch-into-trunk-2-log |
---|
636 | run_pass "$TEST_KEY" fcm log |
---|
637 | sed -i "s/\(.*|.*|\).*\(|.*\)$/\1 date \2/g" $TEST_DIR/$TEST_KEY.out |
---|
638 | file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__ |
---|
639 | ------------------------------------------------------------------------ |
---|
640 | r15 | $LOGNAME | date | 3 lines |
---|
641 | |
---|
642 | foo |
---|
643 | Merged into /${PROJECT}trunk: /${PROJECT}branches/dev/Share/merge1@13 cf. /${PROJECT}branches/dev/Share/merge1@11 |
---|
644 | |
---|
645 | ------------------------------------------------------------------------ |
---|
646 | r12 | $LOGNAME | date | 3 lines |
---|
647 | |
---|
648 | foo |
---|
649 | Merged into /${PROJECT}trunk: /${PROJECT}branches/dev/Share/merge1@11 cf. /${PROJECT}trunk@9 |
---|
650 | |
---|
651 | ------------------------------------------------------------------------ |
---|
652 | r9 | $LOGNAME | date | 1 line |
---|
653 | |
---|
654 | Made another trunk change |
---|
655 | ------------------------------------------------------------------------ |
---|
656 | r8 | $LOGNAME | date | 1 line |
---|
657 | |
---|
658 | Made trunk change |
---|
659 | ------------------------------------------------------------------------ |
---|
660 | r1 | $LOGNAME | date | 1 line |
---|
661 | |
---|
662 | initial trunk import |
---|
663 | ------------------------------------------------------------------------ |
---|
664 | __OUT__ |
---|
665 | file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null |
---|
666 | #------------------------------------------------------------------------------- |
---|
667 | # Test the various mergeinfo output after merging. |
---|
668 | test_mergeinfo "$TEST_KEY_BASE-branch-into-trunk-2-post" \ |
---|
669 | $ROOT_URL/branches/dev/Share/merge1 - 15 <<__RESULTS__ |
---|
670 | begin-prop |
---|
671 | /branches/dev/Share/merge1:4-13 |
---|
672 | end-prop |
---|
673 | begin-info |
---|
674 | youngest common ancestor |
---|
675 | | last full merge |
---|
676 | | | tip of branch |
---|
677 | | | | repository path |
---|
678 | |
---|
679 | 1 13 15 |
---|
680 | | | | |
---|
681 | --| |------------ branches/dev/Share/merge1 |
---|
682 | / \ |
---|
683 | / \ |
---|
684 | -------| |------------ trunk |
---|
685 | | |
---|
686 | WC |
---|
687 | end-info |
---|
688 | begin-eligible |
---|
689 | end-eligible |
---|
690 | begin-merged |
---|
691 | r4 |
---|
692 | r5 |
---|
693 | r10 |
---|
694 | r11 |
---|
695 | r13 |
---|
696 | end-merged |
---|
697 | __RESULTS__ |
---|
698 | #------------------------------------------------------------------------------- |
---|
699 | # Tests fcm merge of trunk-into-branch (2) |
---|
700 | echo "# trunk modification" >>$MOD_FILE |
---|
701 | svn commit -q -m "Made trunk change - a simple edit of $MOD_FILE" |
---|
702 | svn update -q |
---|
703 | svn switch -q $ROOT_URL/branches/dev/Share/merge1 |
---|
704 | |
---|
705 | echo "# added another line for simple repeat testing" >>$BRANCH_MOD_FILE |
---|
706 | svn commit -q -m "Made branch change for merge repeat test" |
---|
707 | svn update -q |
---|
708 | #------------------------------------------------------------------------------ |
---|
709 | # Test the various mergeinfo output before merging. |
---|
710 | test_mergeinfo "$TEST_KEY_BASE-trunk-into-branch-2-pre" \ |
---|
711 | $ROOT_URL/trunk - 17 <<__RESULTS__ |
---|
712 | begin-prop |
---|
713 | /trunk:2-9 |
---|
714 | end-prop |
---|
715 | begin-info |
---|
716 | youngest common ancestor |
---|
717 | | last full merge |
---|
718 | | | tip of branch |
---|
719 | | | | repository path |
---|
720 | |
---|
721 | 1 17 |
---|
722 | | | |
---|
723 | -------| |------------ trunk |
---|
724 | \ / |
---|
725 | \ / |
---|
726 | --| |------------ branches/dev/Share/merge1 |
---|
727 | | | |
---|
728 | 13 WC |
---|
729 | end-info |
---|
730 | begin-eligible |
---|
731 | r12 |
---|
732 | r15 |
---|
733 | r16 |
---|
734 | end-eligible |
---|
735 | begin-merged |
---|
736 | r8 |
---|
737 | r9 |
---|
738 | end-merged |
---|
739 | __RESULTS__ |
---|
740 | #------------------------------------------------------------------------------ |
---|
741 | TEST_KEY=$TEST_KEY_BASE-trunk-into-branch-2 |
---|
742 | run_pass "$TEST_KEY" fcm merge --non-interactive trunk |
---|
743 | file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__ |
---|
744 | Eligible merge(s) from /${PROJECT}trunk@17: 16 15 |
---|
745 | -------------------------------------------------------------------------------- |
---|
746 | Merge: /${PROJECT}trunk@16 |
---|
747 | c.f.: /${PROJECT}branches/dev/Share/merge1@13 |
---|
748 | Merge succeeded. |
---|
749 | --------------------------------------------------------------------------actual |
---|
750 | --- Merging differences between repository URLs into '.': |
---|
751 | U added_file |
---|
752 | --- Recording mergeinfo for merge between repository URLs into '.': |
---|
753 | U . |
---|
754 | --------------------------------------------------------------------------actual |
---|
755 | __OUT__ |
---|
756 | file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null |
---|
757 | #------------------------------------------------------------------------------- |
---|
758 | # Tests svn status result of fcm merge trunk-into-branch (2) |
---|
759 | TEST_KEY=$TEST_KEY_BASE-trunk-into-branch-2-status |
---|
760 | run_pass "$TEST_KEY" svn status --config-dir=$TEST_DIR/.subversion/ |
---|
761 | file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__ |
---|
762 | M . |
---|
763 | M added_file |
---|
764 | __OUT__ |
---|
765 | file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null |
---|
766 | #------------------------------------------------------------------------------- |
---|
767 | # Tests svn diff result of fcm merge trunk-into-branch (2) |
---|
768 | TEST_KEY=$TEST_KEY_BASE-trunk-into-branch-2-diff |
---|
769 | run_pass "$TEST_KEY" svn diff |
---|
770 | diff_sort "$TEST_DIR/$TEST_KEY.out" "$TEST_DIR/$TEST_KEY.sorted.out" |
---|
771 | diff_svn_version_filter >"$TEST_DIR/$TEST_KEY.sorted.ctrl" <<__OUT__ |
---|
772 | |
---|
773 | Index: . |
---|
774 | =================================================================== |
---|
775 | --- . (revision 17) |
---|
776 | +++ . (working copy) |
---|
777 | |
---|
778 | Property changes on: . |
---|
779 | ___________________________________________________________________ |
---|
780 | Modified: svn:mergeinfo |
---|
781 | #IF SVN1.9 ## -0,0 +0,1 ## |
---|
782 | Merged /${PROJECT}trunk:r10-16 |
---|
783 | Index: added_file |
---|
784 | =================================================================== |
---|
785 | --- added_file (revision 17) |
---|
786 | +++ added_file (working copy) |
---|
787 | @@ -1,2 +1,3 @@ |
---|
788 | INCLUDE 'hello_constants.INc' |
---|
789 | call_extra_feature() |
---|
790 | +# trunk modification |
---|
791 | __OUT__ |
---|
792 | file_cmp "$TEST_KEY.sorted.out" "$TEST_KEY.sorted.out" \ |
---|
793 | "$TEST_DIR/$TEST_KEY.sorted.ctrl" |
---|
794 | file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null |
---|
795 | #------------------------------------------------------------------------------- |
---|
796 | # Tests fcm commit of fcm merge trunk-into-branch (2) |
---|
797 | TEST_KEY=$TEST_KEY_BASE-trunk-into-branch-2-commit |
---|
798 | run_pass "$TEST_KEY" fcm commit <<__IN__ |
---|
799 | y |
---|
800 | __IN__ |
---|
801 | sed -i "/^Updating '.':$/d" "$TEST_DIR/$TEST_KEY.out" |
---|
802 | commit_sort "$TEST_DIR/$TEST_KEY.out" "$TEST_DIR/$TEST_KEY.sorted.out" |
---|
803 | file_cmp "$TEST_KEY.sorted.out" "$TEST_KEY.sorted.out" <<__OUT__ |
---|
804 | [info] sed -i 1i\foo: starting commit message editor... |
---|
805 | Change summary: |
---|
806 | -------------------------------------------------------------------------------- |
---|
807 | [Root : $REPOS_URL] |
---|
808 | [Project: ${TEST_PROJECT:-}] |
---|
809 | [Branch : branches/dev/Share/merge1] |
---|
810 | [Sub-dir: ] |
---|
811 | M . |
---|
812 | M added_file |
---|
813 | -------------------------------------------------------------------------------- |
---|
814 | Commit message is as follows: |
---|
815 | -------------------------------------------------------------------------------- |
---|
816 | foo |
---|
817 | Merged into /${PROJECT}branches/dev/Share/merge1: /${PROJECT}trunk@16 cf. /${PROJECT}branches/dev/Share/merge1@13 |
---|
818 | -------------------------------------------------------------------------------- |
---|
819 | *** WARNING: YOU ARE COMMITTING TO A Share BRANCH. |
---|
820 | *** Please ensure that you have the owner's permission. |
---|
821 | Would you like to commit this change? |
---|
822 | Enter "y" or "n" (or just press <return> for "n"): Sending . |
---|
823 | Sending added_file |
---|
824 | Committed revision 18. |
---|
825 | At revision 18. |
---|
826 | __OUT__ |
---|
827 | file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null |
---|
828 | #------------------------------------------------------------------------------- |
---|
829 | # Tests fcm log of fcm merge trunk-into-branch (2) |
---|
830 | TEST_KEY=$TEST_KEY_BASE-trunk-into-branch-2-log |
---|
831 | run_pass "$TEST_KEY" fcm log |
---|
832 | sed -i "s/\(.*|.*|\).*\(|.*\)$/\1 date \2/g" $TEST_DIR/$TEST_KEY.out |
---|
833 | file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__ |
---|
834 | ------------------------------------------------------------------------ |
---|
835 | r18 | $LOGNAME | date | 3 lines |
---|
836 | |
---|
837 | foo |
---|
838 | Merged into /${PROJECT}branches/dev/Share/merge1: /${PROJECT}trunk@16 cf. /${PROJECT}branches/dev/Share/merge1@13 |
---|
839 | |
---|
840 | ------------------------------------------------------------------------ |
---|
841 | r17 | $LOGNAME | date | 1 line |
---|
842 | |
---|
843 | Made branch change for merge repeat test |
---|
844 | ------------------------------------------------------------------------ |
---|
845 | r13 | $LOGNAME | date | 1 line |
---|
846 | |
---|
847 | Made branch change to add extra feature |
---|
848 | ------------------------------------------------------------------------ |
---|
849 | r11 | $LOGNAME | date | 1 line |
---|
850 | |
---|
851 | edit on branch for merge repeat test |
---|
852 | ------------------------------------------------------------------------ |
---|
853 | r10 | $LOGNAME | date | 3 lines |
---|
854 | |
---|
855 | foo |
---|
856 | Merged into /${PROJECT}branches/dev/Share/merge1: /${PROJECT}trunk@9 cf. /${PROJECT}trunk@1 |
---|
857 | |
---|
858 | ------------------------------------------------------------------------ |
---|
859 | r5 | $LOGNAME | date | 1 line |
---|
860 | |
---|
861 | Made changes for future merge of this branch |
---|
862 | ------------------------------------------------------------------------ |
---|
863 | r4 | $LOGNAME | date | 1 line |
---|
864 | |
---|
865 | Made a branch Created /${PROJECT}branches/dev/Share/merge1 from /trunk@1. |
---|
866 | ------------------------------------------------------------------------ |
---|
867 | r1 | $LOGNAME | date | 1 line |
---|
868 | |
---|
869 | initial trunk import |
---|
870 | ------------------------------------------------------------------------ |
---|
871 | __OUT__ |
---|
872 | file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null |
---|
873 | #------------------------------------------------------------------------------- |
---|
874 | # Test the various mergeinfo output after merging. |
---|
875 | test_mergeinfo "$TEST_KEY_BASE-trunk-into-branch-2-post" \ |
---|
876 | $ROOT_URL/trunk - 18 <<__RESULTS__ |
---|
877 | begin-prop |
---|
878 | /trunk:2-16 |
---|
879 | end-prop |
---|
880 | begin-info |
---|
881 | youngest common ancestor |
---|
882 | | last full merge |
---|
883 | | | tip of branch |
---|
884 | | | | repository path |
---|
885 | |
---|
886 | 1 16 18 |
---|
887 | | | | |
---|
888 | -------| |------------ trunk |
---|
889 | \ \ |
---|
890 | \ \ |
---|
891 | --| |------------ branches/dev/Share/merge1 |
---|
892 | | |
---|
893 | WC |
---|
894 | end-info |
---|
895 | begin-eligible |
---|
896 | end-eligible |
---|
897 | begin-merged |
---|
898 | r8 |
---|
899 | r9 |
---|
900 | r12 |
---|
901 | r15 |
---|
902 | r16 |
---|
903 | end-merged |
---|
904 | __RESULTS__ |
---|
905 | #------------------------------------------------------------------------------- |
---|
906 | # Tests fcm merge of branch-into-trunk (3) |
---|
907 | svn delete -q $BRANCH_MOD_FILE |
---|
908 | svn copy -q $MOD_FILE $MOD_FILE.add |
---|
909 | svn commit -q -m "Made branch change - deleted $BRANCH_MOD_FILE, copied $MOD_FILE" |
---|
910 | svn update -q |
---|
911 | svn switch -q $ROOT_URL/trunk |
---|
912 | #------------------------------------------------------------------------------- |
---|
913 | # Test the various mergeinfo output before merging. |
---|
914 | test_mergeinfo "$TEST_KEY_BASE-branch-into-trunk-3-pre" \ |
---|
915 | $ROOT_URL/branches/dev/Share/merge1 - 19 <<__RESULTS__ |
---|
916 | begin-prop |
---|
917 | /branches/dev/Share/merge1:4-13 |
---|
918 | end-prop |
---|
919 | begin-info |
---|
920 | youngest common ancestor |
---|
921 | | last full merge |
---|
922 | | | tip of branch |
---|
923 | | | | repository path |
---|
924 | |
---|
925 | 1 19 |
---|
926 | | | |
---|
927 | --| |------------ branches/dev/Share/merge1 |
---|
928 | / / |
---|
929 | / / |
---|
930 | -------| |------------ trunk |
---|
931 | | | |
---|
932 | 16 WC |
---|
933 | end-info |
---|
934 | begin-eligible |
---|
935 | r17 |
---|
936 | r18 |
---|
937 | r19 |
---|
938 | end-eligible |
---|
939 | begin-merged |
---|
940 | r4 |
---|
941 | r5 |
---|
942 | r10 |
---|
943 | r11 |
---|
944 | r13 |
---|
945 | end-merged |
---|
946 | __RESULTS__ |
---|
947 | #------------------------------------------------------------------------------- |
---|
948 | TEST_KEY=$TEST_KEY_BASE-branch-into-trunk-3 |
---|
949 | run_pass "$TEST_KEY" fcm merge --non-interactive branches/dev/Share/merge1 |
---|
950 | file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__ |
---|
951 | Eligible merge(s) from /${PROJECT}branches/dev/Share/merge1@19: 19 18 |
---|
952 | -------------------------------------------------------------------------------- |
---|
953 | Merge: /${PROJECT}branches/dev/Share/merge1@19 |
---|
954 | c.f.: /${PROJECT}trunk@16 |
---|
955 | Merge succeeded. |
---|
956 | --------------------------------------------------------------------------actual |
---|
957 | --- Merging differences between repository URLs into '.': |
---|
958 | D added_directory/hello_constants_dummy.inc |
---|
959 | A added_file.add |
---|
960 | --- Recording mergeinfo for merge between repository URLs into '.': |
---|
961 | U . |
---|
962 | --------------------------------------------------------------------------actual |
---|
963 | __OUT__ |
---|
964 | file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null |
---|
965 | #------------------------------------------------------------------------------- |
---|
966 | # Tests svn status result of fcm merge branch-into-trunk (3) |
---|
967 | TEST_KEY=$TEST_KEY_BASE-branch-into-trunk-3-status |
---|
968 | run_pass "$TEST_KEY" svn status --config-dir=$TEST_DIR/.subversion/ |
---|
969 | file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__ |
---|
970 | M . |
---|
971 | D added_directory/hello_constants_dummy.inc |
---|
972 | A + added_file.add |
---|
973 | __OUT__ |
---|
974 | file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null |
---|
975 | #------------------------------------------------------------------------------- |
---|
976 | # Tests svn diff result of fcm merge branch-into-trunk (3) |
---|
977 | TEST_KEY=$TEST_KEY_BASE-branch-into-trunk-3-diff |
---|
978 | run_pass "$TEST_KEY" svn diff |
---|
979 | diff_sort "$TEST_DIR/$TEST_KEY.out" "$TEST_DIR/$TEST_KEY.sorted.out" |
---|
980 | diff_svn_version_filter >"$TEST_DIR/$TEST_KEY.sorted.ctrl" <<__OUT__ |
---|
981 | |
---|
982 | Index: . |
---|
983 | =================================================================== |
---|
984 | --- . (revision 19) |
---|
985 | +++ . (working copy) |
---|
986 | |
---|
987 | Property changes on: . |
---|
988 | ___________________________________________________________________ |
---|
989 | Modified: svn:mergeinfo |
---|
990 | #IF SVN1.9 ## -0,0 +0,1 ## |
---|
991 | Merged /${PROJECT}branches/dev/Share/merge1:r14-19 |
---|
992 | Index: added_directory/hello_constants_dummy.inc |
---|
993 | =================================================================== |
---|
994 | --- added_directory/hello_constants_dummy.inc (revision 19) |
---|
995 | +++ added_directory/hello_constants_dummy.inc (working copy) |
---|
996 | @@ -1,2 +0,0 @@ |
---|
997 | -INCLUDE 'hello_constants.INc' |
---|
998 | -# added this line for simple repeat testing |
---|
999 | #IF SVN1.9 Index: added_file.add |
---|
1000 | #IF SVN1.9 =================================================================== |
---|
1001 | __OUT__ |
---|
1002 | file_cmp "$TEST_KEY.sorted.out" "$TEST_KEY.sorted.out" \ |
---|
1003 | "$TEST_DIR/$TEST_KEY.sorted.ctrl" |
---|
1004 | file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null |
---|
1005 | #------------------------------------------------------------------------------- |
---|
1006 | # Tests fcm commit of fcm merge branch-into-trunk (3) |
---|
1007 | TEST_KEY=$TEST_KEY_BASE-branch-into-trunk-3-commit |
---|
1008 | run_pass "$TEST_KEY" fcm commit <<__IN__ |
---|
1009 | y |
---|
1010 | __IN__ |
---|
1011 | sed -i "/^Updating '.':$/d" $TEST_DIR/"$TEST_KEY.out" |
---|
1012 | commit_sort "$TEST_DIR/$TEST_KEY.out" "$TEST_DIR/$TEST_KEY.sorted.out" |
---|
1013 | file_cmp "$TEST_KEY.sorted.out" "$TEST_KEY.sorted.out" <<__OUT__ |
---|
1014 | [info] sed -i 1i\foo: starting commit message editor... |
---|
1015 | Change summary: |
---|
1016 | -------------------------------------------------------------------------------- |
---|
1017 | [Root : $REPOS_URL] |
---|
1018 | [Project: ${TEST_PROJECT:-}] |
---|
1019 | [Branch : trunk] |
---|
1020 | [Sub-dir: ] |
---|
1021 | M . |
---|
1022 | A + added_file.add |
---|
1023 | D added_directory/hello_constants_dummy.inc |
---|
1024 | -------------------------------------------------------------------------------- |
---|
1025 | Commit message is as follows: |
---|
1026 | -------------------------------------------------------------------------------- |
---|
1027 | foo |
---|
1028 | Merged into /${PROJECT}trunk: /${PROJECT}branches/dev/Share/merge1@19 cf. /${PROJECT}trunk@16 |
---|
1029 | -------------------------------------------------------------------------------- |
---|
1030 | *** WARNING: YOU ARE COMMITTING TO THE TRUNK. |
---|
1031 | *** Please ensure that your change conforms to your project's working practices. |
---|
1032 | Would you like to commit this change? |
---|
1033 | Enter "y" or "n" (or just press <return> for "n"): Sending . |
---|
1034 | Adding added_file.add |
---|
1035 | Deleting added_directory/hello_constants_dummy.inc |
---|
1036 | Committed revision 20. |
---|
1037 | At revision 20. |
---|
1038 | __OUT__ |
---|
1039 | file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null |
---|
1040 | #------------------------------------------------------------------------------- |
---|
1041 | # Tests fcm log of fcm merge branch-into-trunk (3) |
---|
1042 | TEST_KEY=$TEST_KEY_BASE-branch-into-trunk-3-log |
---|
1043 | run_pass "$TEST_KEY" fcm log $ROOT_URL |
---|
1044 | sed -i "s/\(.*|.*|\).*\(|.*\)$/\1 date \2/g" $TEST_DIR/$TEST_KEY.out |
---|
1045 | file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__ |
---|
1046 | ------------------------------------------------------------------------ |
---|
1047 | r20 | $LOGNAME | date | 3 lines |
---|
1048 | |
---|
1049 | foo |
---|
1050 | Merged into /${PROJECT}trunk: /${PROJECT}branches/dev/Share/merge1@19 cf. /${PROJECT}trunk@16 |
---|
1051 | |
---|
1052 | ------------------------------------------------------------------------ |
---|
1053 | r19 | $LOGNAME | date | 1 line |
---|
1054 | |
---|
1055 | Made branch change - deleted added_directory/hello_constants_dummy.inc, copied added_file |
---|
1056 | ------------------------------------------------------------------------ |
---|
1057 | r18 | $LOGNAME | date | 3 lines |
---|
1058 | |
---|
1059 | foo |
---|
1060 | Merged into /${PROJECT}branches/dev/Share/merge1: /${PROJECT}trunk@16 cf. /${PROJECT}branches/dev/Share/merge1@13 |
---|
1061 | |
---|
1062 | ------------------------------------------------------------------------ |
---|
1063 | r17 | $LOGNAME | date | 1 line |
---|
1064 | |
---|
1065 | Made branch change for merge repeat test |
---|
1066 | ------------------------------------------------------------------------ |
---|
1067 | r16 | $LOGNAME | date | 1 line |
---|
1068 | |
---|
1069 | Made trunk change - a simple edit of added_file |
---|
1070 | ------------------------------------------------------------------------ |
---|
1071 | r15 | $LOGNAME | date | 3 lines |
---|
1072 | |
---|
1073 | foo |
---|
1074 | Merged into /${PROJECT}trunk: /${PROJECT}branches/dev/Share/merge1@13 cf. /${PROJECT}branches/dev/Share/merge1@11 |
---|
1075 | |
---|
1076 | ------------------------------------------------------------------------ |
---|
1077 | r14 | $LOGNAME | date | 1 line |
---|
1078 | |
---|
1079 | Made a branch Created /branches/dev/Share/merge3 from /trunk@1. |
---|
1080 | ------------------------------------------------------------------------ |
---|
1081 | r13 | $LOGNAME | date | 1 line |
---|
1082 | |
---|
1083 | Made branch change to add extra feature |
---|
1084 | ------------------------------------------------------------------------ |
---|
1085 | r12 | $LOGNAME | date | 3 lines |
---|
1086 | |
---|
1087 | foo |
---|
1088 | Merged into /${PROJECT}trunk: /${PROJECT}branches/dev/Share/merge1@11 cf. /${PROJECT}trunk@9 |
---|
1089 | |
---|
1090 | ------------------------------------------------------------------------ |
---|
1091 | r11 | $LOGNAME | date | 1 line |
---|
1092 | |
---|
1093 | edit on branch for merge repeat test |
---|
1094 | ------------------------------------------------------------------------ |
---|
1095 | r10 | $LOGNAME | date | 3 lines |
---|
1096 | |
---|
1097 | foo |
---|
1098 | Merged into /${PROJECT}branches/dev/Share/merge1: /${PROJECT}trunk@9 cf. /${PROJECT}trunk@1 |
---|
1099 | |
---|
1100 | ------------------------------------------------------------------------ |
---|
1101 | r9 | $LOGNAME | date | 1 line |
---|
1102 | |
---|
1103 | Made another trunk change |
---|
1104 | ------------------------------------------------------------------------ |
---|
1105 | r8 | $LOGNAME | date | 1 line |
---|
1106 | |
---|
1107 | Made trunk change |
---|
1108 | ------------------------------------------------------------------------ |
---|
1109 | r7 | $LOGNAME | date | 1 line |
---|
1110 | |
---|
1111 | Made changes for future merge |
---|
1112 | ------------------------------------------------------------------------ |
---|
1113 | r6 | $LOGNAME | date | 1 line |
---|
1114 | |
---|
1115 | Made a branch Created /${PROJECT}branches/dev/Share/merge2 from /trunk@1. |
---|
1116 | ------------------------------------------------------------------------ |
---|
1117 | r5 | $LOGNAME | date | 1 line |
---|
1118 | |
---|
1119 | Made changes for future merge of this branch |
---|
1120 | ------------------------------------------------------------------------ |
---|
1121 | r4 | $LOGNAME | date | 1 line |
---|
1122 | |
---|
1123 | Made a branch Created /${PROJECT}branches/dev/Share/merge1 from /trunk@1. |
---|
1124 | ------------------------------------------------------------------------ |
---|
1125 | r3 | $LOGNAME | date | 1 line |
---|
1126 | |
---|
1127 | |
---|
1128 | ------------------------------------------------------------------------ |
---|
1129 | r2 | $LOGNAME | date | 1 line |
---|
1130 | |
---|
1131 | make tags |
---|
1132 | ------------------------------------------------------------------------ |
---|
1133 | r1 | $LOGNAME | date | 1 line |
---|
1134 | |
---|
1135 | initial trunk import |
---|
1136 | ------------------------------------------------------------------------ |
---|
1137 | __OUT__ |
---|
1138 | file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null |
---|
1139 | #------------------------------------------------------------------------------- |
---|
1140 | # Test the various mergeinfo output after merging. |
---|
1141 | test_mergeinfo "$TEST_KEY_BASE-branch-into-trunk-3-post" \ |
---|
1142 | $ROOT_URL/branches/dev/Share/merge1 - 20 <<__RESULTS__ |
---|
1143 | begin-prop |
---|
1144 | /branches/dev/Share/merge1:4-19 |
---|
1145 | end-prop |
---|
1146 | begin-info |
---|
1147 | youngest common ancestor |
---|
1148 | | last full merge |
---|
1149 | | | tip of branch |
---|
1150 | | | | repository path |
---|
1151 | |
---|
1152 | 1 19 20 |
---|
1153 | | | | |
---|
1154 | --| |------------ branches/dev/Share/merge1 |
---|
1155 | / \ |
---|
1156 | / \ |
---|
1157 | -------| |------------ trunk |
---|
1158 | | |
---|
1159 | WC |
---|
1160 | end-info |
---|
1161 | begin-eligible |
---|
1162 | end-eligible |
---|
1163 | begin-merged |
---|
1164 | r4 |
---|
1165 | r5 |
---|
1166 | r10 |
---|
1167 | r11 |
---|
1168 | r13 |
---|
1169 | r17 |
---|
1170 | r18 |
---|
1171 | r19 |
---|
1172 | end-merged |
---|
1173 | __RESULTS__ |
---|
1174 | #------------------------------------------------------------------------------- |
---|
1175 | # Tests fcm merge of branch-into-branch (1) |
---|
1176 | cd $TEST_DIR |
---|
1177 | rm -rf $TEST_DIR/wc |
---|
1178 | mkdir $TEST_DIR/wc |
---|
1179 | svn checkout -q $ROOT_URL/branches/dev/Share/merge2 $TEST_DIR/wc |
---|
1180 | cd $TEST_DIR/wc |
---|
1181 | BRANCH_2_MOD_FILE="module/hello_constants.f90" |
---|
1182 | echo "Second branch change" >>$BRANCH_2_MOD_FILE |
---|
1183 | svn commit -q -m "Made branch change - added to $BRANCH_2_MOD_FILE" |
---|
1184 | svn update -q |
---|
1185 | #------------------------------------------------------------------------------ |
---|
1186 | # Test the various mergeinfo output before merging. |
---|
1187 | test_mergeinfo "$TEST_KEY_BASE-branch-into-branch-1-pre" \ |
---|
1188 | $ROOT_URL/branches/dev/Share/merge1 - 21 <<__RESULTS__ |
---|
1189 | begin-prop |
---|
1190 | end-prop |
---|
1191 | begin-info |
---|
1192 | youngest common ancestor |
---|
1193 | | last full merge |
---|
1194 | | | tip of branch |
---|
1195 | | | | repository path |
---|
1196 | |
---|
1197 | 1 21 |
---|
1198 | | | |
---|
1199 | --| |------------ branches/dev/Share/merge1 |
---|
1200 | ... / |
---|
1201 | \ |
---|
1202 | --| |------------ branches/dev/Share/merge2 |
---|
1203 | | |
---|
1204 | WC |
---|
1205 | end-info |
---|
1206 | begin-eligible |
---|
1207 | r5 |
---|
1208 | r10 |
---|
1209 | r11 |
---|
1210 | r13 |
---|
1211 | r17 |
---|
1212 | r18 |
---|
1213 | r19 |
---|
1214 | end-eligible |
---|
1215 | begin-merged |
---|
1216 | end-merged |
---|
1217 | __RESULTS__ |
---|
1218 | #------------------------------------------------------------------------------ |
---|
1219 | TEST_KEY=$TEST_KEY_BASE-branch-into-branch-1 |
---|
1220 | run_pass "$TEST_KEY" fcm merge $ROOT_URL/branches/dev/Share/merge1 <<__IN__ |
---|
1221 | 13 |
---|
1222 | y |
---|
1223 | __IN__ |
---|
1224 | merge_sort "$TEST_DIR/$TEST_KEY.out" "$TEST_DIR/$TEST_KEY.sorted.out" |
---|
1225 | file_cmp "$TEST_KEY.sorted.out" "$TEST_KEY.sorted.out" <<__OUT__ |
---|
1226 | Eligible merge(s) from /${PROJECT}branches/dev/Share/merge1@21: 19 18 17 13 11 10 5 |
---|
1227 | Enter a revision (or just press <return> for "19"): -------------------------------------------------------------------------------- |
---|
1228 | Merge: /${PROJECT}branches/dev/Share/merge1@13 |
---|
1229 | c.f.: /${PROJECT}trunk@1 |
---|
1230 | -------------------------------------------------------------------------dry-run |
---|
1231 | --- Merging r4 through r13 into '.': |
---|
1232 | U . |
---|
1233 | A added_directory |
---|
1234 | A added_directory/hello_constants.f90 |
---|
1235 | A added_directory/hello_constants.inc |
---|
1236 | A added_directory/hello_constants_dummy.inc |
---|
1237 | A added_file |
---|
1238 | A module/tree_conflict_file |
---|
1239 | U lib/python/info/__init__.py |
---|
1240 | U lib/python/info/poems.py |
---|
1241 | U module/hello_constants.f90 |
---|
1242 | U module/hello_constants.inc |
---|
1243 | U module/hello_constants_dummy.inc |
---|
1244 | U subroutine/hello_sub_dummy.h |
---|
1245 | -------------------------------------------------------------------------dry-run |
---|
1246 | Would you like to go ahead with the merge? |
---|
1247 | Enter "y" or "n" (or just press <return> for "n"): |
---|
1248 | Merge succeeded. |
---|
1249 | --------------------------------------------------------------------------actual |
---|
1250 | --- Merging r4 through r13 into '.': |
---|
1251 | U . |
---|
1252 | A added_directory |
---|
1253 | A added_directory/hello_constants.f90 |
---|
1254 | A added_directory/hello_constants.inc |
---|
1255 | A added_directory/hello_constants_dummy.inc |
---|
1256 | A added_file |
---|
1257 | A module/tree_conflict_file |
---|
1258 | U lib/python/info/__init__.py |
---|
1259 | U lib/python/info/poems.py |
---|
1260 | U module/hello_constants.f90 |
---|
1261 | U module/hello_constants.inc |
---|
1262 | U module/hello_constants_dummy.inc |
---|
1263 | U subroutine/hello_sub_dummy.h |
---|
1264 | --- Recording mergeinfo for merge of r4 through r13 into '.': |
---|
1265 | G . |
---|
1266 | --------------------------------------------------------------------------actual |
---|
1267 | __OUT__ |
---|
1268 | file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null |
---|
1269 | #------------------------------------------------------------------------------- |
---|
1270 | # Tests svn status result of fcm merge branch-into-branch (1) |
---|
1271 | TEST_KEY=$TEST_KEY_BASE-branch-into-branch-1-status |
---|
1272 | run_pass "$TEST_KEY" svn status --config-dir=$TEST_DIR/.subversion/ |
---|
1273 | status_sort "$TEST_DIR/$TEST_KEY.out" "$TEST_DIR/$TEST_KEY.sorted.out" |
---|
1274 | file_cmp "$TEST_KEY.sorted.out" "$TEST_KEY.sorted.out" <<__OUT__ |
---|
1275 | M . |
---|
1276 | A + added_directory |
---|
1277 | A + added_file |
---|
1278 | A + module/tree_conflict_file |
---|
1279 | M lib/python/info/__init__.py |
---|
1280 | M lib/python/info/poems.py |
---|
1281 | M module/hello_constants.f90 |
---|
1282 | M module/hello_constants.inc |
---|
1283 | M module/hello_constants_dummy.inc |
---|
1284 | M subroutine/hello_sub_dummy.h |
---|
1285 | __OUT__ |
---|
1286 | file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null |
---|
1287 | #------------------------------------------------------------------------------- |
---|
1288 | # Tests svn diff result of fcm merge branch-into-branch (1) |
---|
1289 | TEST_KEY=$TEST_KEY_BASE-branch-into-branch-1-diff |
---|
1290 | run_pass "$TEST_KEY" svn diff |
---|
1291 | diff_sort "$TEST_DIR/$TEST_KEY.out" "$TEST_DIR/$TEST_KEY.sorted.out" |
---|
1292 | diff_svn_version_filter >"$TEST_DIR/$TEST_KEY.sorted.ctrl" <<__OUT__ |
---|
1293 | |
---|
1294 | Index: . |
---|
1295 | =================================================================== |
---|
1296 | --- . (revision 21) |
---|
1297 | +++ . (working copy) |
---|
1298 | |
---|
1299 | Property changes on: . |
---|
1300 | ___________________________________________________________________ |
---|
1301 | Added: svn:mergeinfo |
---|
1302 | #IF SVN1.9 ## -0,0 +0,2 ## |
---|
1303 | Merged /${PROJECT}trunk:r2-9 |
---|
1304 | Merged /${PROJECT}branches/dev/Share/merge1:r4-13 |
---|
1305 | #IF SVN1.9 Index: added_directory/hello_constants.f90 |
---|
1306 | #IF SVN1.9 =================================================================== |
---|
1307 | #IF SVN1.9 Index: added_directory/hello_constants.inc |
---|
1308 | #IF SVN1.9 =================================================================== |
---|
1309 | #IF SVN1.9 Index: added_directory/hello_constants_dummy.inc |
---|
1310 | #IF SVN1.9 =================================================================== |
---|
1311 | #IF SVN1.9 Index: added_file |
---|
1312 | #IF SVN1.9 =================================================================== |
---|
1313 | Index: lib/python/info/__init__.py |
---|
1314 | =================================================================== |
---|
1315 | --- lib/python/info/__init__.py (revision 21) |
---|
1316 | +++ lib/python/info/__init__.py (working copy) |
---|
1317 | @@ -0,0 +1,2 @@ |
---|
1318 | +trunk change |
---|
1319 | +another trunk change |
---|
1320 | Index: lib/python/info/poems.py |
---|
1321 | =================================================================== |
---|
1322 | --- lib/python/info/poems.py (revision 21) |
---|
1323 | +++ lib/python/info/poems.py (working copy) |
---|
1324 | @@ -1,24 +1,23 @@ |
---|
1325 | -#!/usr/bin/env python |
---|
1326 | -# -*- coding: utf-8 -*- |
---|
1327 | """The Python, by Hilaire Belloc |
---|
1328 | |
---|
1329 | A Python I should not advise,-- |
---|
1330 | -It needs a doctor for its eyes, |
---|
1331 | +It needs a doctor FOR its eyes, |
---|
1332 | And has the measles yearly. |
---|
1333 | -However, if you feel inclined |
---|
1334 | -To get one (to improve your mind, |
---|
1335 | +However, if you feel INclINed |
---|
1336 | +To get one ( |
---|
1337 | +to improve your mINd, |
---|
1338 | And not from fashion merely), |
---|
1339 | Allow no music near its cage; |
---|
1340 | -And when it flies into a rage |
---|
1341 | +And when it flies INto a rage |
---|
1342 | Chastise it, most severely. |
---|
1343 | -I had an aunt in Yucatan |
---|
1344 | +I had an aunt IN Yucatan |
---|
1345 | Who bought a Python from a man |
---|
1346 | -And kept it for a pet. |
---|
1347 | +And kept it FOR a pet. |
---|
1348 | She died, because she never knew |
---|
1349 | These simple little rules and few;-- |
---|
1350 | -The Snake is living yet. |
---|
1351 | +The Snake is livINg yet. |
---|
1352 | """ |
---|
1353 | |
---|
1354 | import this |
---|
1355 | |
---|
1356 | -print "\n", __doc__ |
---|
1357 | +prINt "\n", __doc__ |
---|
1358 | Index: module/hello_constants.f90 |
---|
1359 | =================================================================== |
---|
1360 | --- module/hello_constants.f90 (revision 21) |
---|
1361 | +++ module/hello_constants.f90 (working copy) |
---|
1362 | @@ -1,6 +1,6 @@ |
---|
1363 | MODULE Hello_Constants |
---|
1364 | |
---|
1365 | -INCLUDE 'hello_constants_dummy.inc' |
---|
1366 | +INCLUDE 'hello_constants_dummy.INc' |
---|
1367 | |
---|
1368 | END MODULE Hello_Constants |
---|
1369 | Second branch change |
---|
1370 | Index: module/hello_constants.inc |
---|
1371 | =================================================================== |
---|
1372 | --- module/hello_constants.inc (revision 21) |
---|
1373 | +++ module/hello_constants.inc (working copy) |
---|
1374 | @@ -1 +1,2 @@ |
---|
1375 | -CHARACTER (LEN=80), PARAMETER :: hello_string = 'Hello Earth!' |
---|
1376 | +CHARACTER ( |
---|
1377 | +LEN=80), PARAMETER :: hello_strINg = 'Hello Earth!!' |
---|
1378 | Index: module/hello_constants_dummy.inc |
---|
1379 | =================================================================== |
---|
1380 | --- module/hello_constants_dummy.inc (revision 21) |
---|
1381 | +++ module/hello_constants_dummy.inc (working copy) |
---|
1382 | @@ -1 +1 @@ |
---|
1383 | -INCLUDE 'hello_constants.inc' |
---|
1384 | +INCLUDE 'hello_constants.INc' |
---|
1385 | #IF SVN1.9 Index: module/tree_conflict_file |
---|
1386 | #IF SVN1.9 =================================================================== |
---|
1387 | Index: subroutine/hello_sub_dummy.h |
---|
1388 | =================================================================== |
---|
1389 | --- subroutine/hello_sub_dummy.h (revision 21) |
---|
1390 | +++ subroutine/hello_sub_dummy.h (working copy) |
---|
1391 | @@ -1 +1,2 @@ |
---|
1392 | #include "hello_sub.h" |
---|
1393 | +Modified a line |
---|
1394 | __OUT__ |
---|
1395 | file_cmp "$TEST_KEY.sorted.out" "$TEST_KEY.sorted.out" \ |
---|
1396 | "$TEST_DIR/$TEST_KEY.sorted.ctrl" |
---|
1397 | file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null |
---|
1398 | #------------------------------------------------------------------------------- |
---|
1399 | # Tests fcm commit of fcm merge branch-into-branch (1) |
---|
1400 | TEST_KEY=$TEST_KEY_BASE-branch-into-branch-1-commit |
---|
1401 | run_pass "$TEST_KEY" fcm commit <<__IN__ |
---|
1402 | y |
---|
1403 | __IN__ |
---|
1404 | commit_sort "$TEST_DIR/$TEST_KEY.out" "$TEST_DIR/$TEST_KEY.sorted.out" |
---|
1405 | file_cmp "$TEST_KEY.sorted.out" "$TEST_KEY.sorted.out" <<__OUT__ |
---|
1406 | [info] sed -i 1i\foo: starting commit message editor... |
---|
1407 | Change summary: |
---|
1408 | -------------------------------------------------------------------------------- |
---|
1409 | [Root : $REPOS_URL] |
---|
1410 | [Project: ${TEST_PROJECT:-}] |
---|
1411 | [Branch : branches/dev/Share/merge2] |
---|
1412 | [Sub-dir: ] |
---|
1413 | M . |
---|
1414 | A + added_directory |
---|
1415 | A + added_file |
---|
1416 | A + module/tree_conflict_file |
---|
1417 | M lib/python/info/__init__.py |
---|
1418 | M lib/python/info/poems.py |
---|
1419 | M module/hello_constants.f90 |
---|
1420 | M module/hello_constants.inc |
---|
1421 | M module/hello_constants_dummy.inc |
---|
1422 | M subroutine/hello_sub_dummy.h |
---|
1423 | -------------------------------------------------------------------------------- |
---|
1424 | Commit message is as follows: |
---|
1425 | -------------------------------------------------------------------------------- |
---|
1426 | foo |
---|
1427 | Merged into /${PROJECT}branches/dev/Share/merge2: /${PROJECT}branches/dev/Share/merge1@13 cf. /${PROJECT}trunk@1 |
---|
1428 | -------------------------------------------------------------------------------- |
---|
1429 | *** WARNING: YOU ARE COMMITTING TO A Share BRANCH. |
---|
1430 | *** Please ensure that you have the owner's permission. |
---|
1431 | Would you like to commit this change? |
---|
1432 | Enter "y" or "n" (or just press <return> for "n"): Sending . |
---|
1433 | Adding added_directory |
---|
1434 | Adding added_file |
---|
1435 | Adding module/tree_conflict_file |
---|
1436 | Sending lib/python/info/__init__.py |
---|
1437 | Sending lib/python/info/poems.py |
---|
1438 | Sending module/hello_constants.f90 |
---|
1439 | Sending module/hello_constants.inc |
---|
1440 | Sending module/hello_constants_dummy.inc |
---|
1441 | Sending subroutine/hello_sub_dummy.h |
---|
1442 | Committed revision 22. |
---|
1443 | Updating '.': |
---|
1444 | At revision 22. |
---|
1445 | __OUT__ |
---|
1446 | file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null |
---|
1447 | #------------------------------------------------------------------------------- |
---|
1448 | # Tests fcm log of fcm merge branch-into-branch (1) |
---|
1449 | TEST_KEY=$TEST_KEY_BASE-branch-into-branch-1-log |
---|
1450 | run_pass "$TEST_KEY" fcm log $REPOS_URL |
---|
1451 | sed -i "s/\(.*|.*|\).*\(|.*\)$/\1 date \2/g" $TEST_DIR/$TEST_KEY.out |
---|
1452 | file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__ |
---|
1453 | ------------------------------------------------------------------------ |
---|
1454 | r22 | $LOGNAME | date | 3 lines |
---|
1455 | |
---|
1456 | foo |
---|
1457 | Merged into /${PROJECT}branches/dev/Share/merge2: /${PROJECT}branches/dev/Share/merge1@13 cf. /${PROJECT}trunk@1 |
---|
1458 | |
---|
1459 | ------------------------------------------------------------------------ |
---|
1460 | r21 | $LOGNAME | date | 1 line |
---|
1461 | |
---|
1462 | Made branch change - added to module/hello_constants.f90 |
---|
1463 | ------------------------------------------------------------------------ |
---|
1464 | r20 | $LOGNAME | date | 3 lines |
---|
1465 | |
---|
1466 | foo |
---|
1467 | Merged into /${PROJECT}trunk: /${PROJECT}branches/dev/Share/merge1@19 cf. /${PROJECT}trunk@16 |
---|
1468 | |
---|
1469 | ------------------------------------------------------------------------ |
---|
1470 | r19 | $LOGNAME | date | 1 line |
---|
1471 | |
---|
1472 | Made branch change - deleted added_directory/hello_constants_dummy.inc, copied added_file |
---|
1473 | ------------------------------------------------------------------------ |
---|
1474 | r18 | $LOGNAME | date | 3 lines |
---|
1475 | |
---|
1476 | foo |
---|
1477 | Merged into /${PROJECT}branches/dev/Share/merge1: /${PROJECT}trunk@16 cf. /${PROJECT}branches/dev/Share/merge1@13 |
---|
1478 | |
---|
1479 | ------------------------------------------------------------------------ |
---|
1480 | r17 | $LOGNAME | date | 1 line |
---|
1481 | |
---|
1482 | Made branch change for merge repeat test |
---|
1483 | ------------------------------------------------------------------------ |
---|
1484 | r16 | $LOGNAME | date | 1 line |
---|
1485 | |
---|
1486 | Made trunk change - a simple edit of added_file |
---|
1487 | ------------------------------------------------------------------------ |
---|
1488 | r15 | $LOGNAME | date | 3 lines |
---|
1489 | |
---|
1490 | foo |
---|
1491 | Merged into /${PROJECT}trunk: /${PROJECT}branches/dev/Share/merge1@13 cf. /${PROJECT}branches/dev/Share/merge1@11 |
---|
1492 | |
---|
1493 | ------------------------------------------------------------------------ |
---|
1494 | r14 | $LOGNAME | date | 1 line |
---|
1495 | |
---|
1496 | Made a branch Created /branches/dev/Share/merge3 from /trunk@1. |
---|
1497 | ------------------------------------------------------------------------ |
---|
1498 | r13 | $LOGNAME | date | 1 line |
---|
1499 | |
---|
1500 | Made branch change to add extra feature |
---|
1501 | ------------------------------------------------------------------------ |
---|
1502 | r12 | $LOGNAME | date | 3 lines |
---|
1503 | |
---|
1504 | foo |
---|
1505 | Merged into /${PROJECT}trunk: /${PROJECT}branches/dev/Share/merge1@11 cf. /${PROJECT}trunk@9 |
---|
1506 | |
---|
1507 | ------------------------------------------------------------------------ |
---|
1508 | r11 | $LOGNAME | date | 1 line |
---|
1509 | |
---|
1510 | edit on branch for merge repeat test |
---|
1511 | ------------------------------------------------------------------------ |
---|
1512 | r10 | $LOGNAME | date | 3 lines |
---|
1513 | |
---|
1514 | foo |
---|
1515 | Merged into /${PROJECT}branches/dev/Share/merge1: /${PROJECT}trunk@9 cf. /${PROJECT}trunk@1 |
---|
1516 | |
---|
1517 | ------------------------------------------------------------------------ |
---|
1518 | r9 | $LOGNAME | date | 1 line |
---|
1519 | |
---|
1520 | Made another trunk change |
---|
1521 | ------------------------------------------------------------------------ |
---|
1522 | r8 | $LOGNAME | date | 1 line |
---|
1523 | |
---|
1524 | Made trunk change |
---|
1525 | ------------------------------------------------------------------------ |
---|
1526 | r7 | $LOGNAME | date | 1 line |
---|
1527 | |
---|
1528 | Made changes for future merge |
---|
1529 | ------------------------------------------------------------------------ |
---|
1530 | r6 | $LOGNAME | date | 1 line |
---|
1531 | |
---|
1532 | Made a branch Created /${PROJECT}branches/dev/Share/merge2 from /trunk@1. |
---|
1533 | ------------------------------------------------------------------------ |
---|
1534 | r5 | $LOGNAME | date | 1 line |
---|
1535 | |
---|
1536 | Made changes for future merge of this branch |
---|
1537 | ------------------------------------------------------------------------ |
---|
1538 | r4 | $LOGNAME | date | 1 line |
---|
1539 | |
---|
1540 | Made a branch Created /${PROJECT}branches/dev/Share/merge1 from /trunk@1. |
---|
1541 | ------------------------------------------------------------------------ |
---|
1542 | r3 | $LOGNAME | date | 1 line |
---|
1543 | |
---|
1544 | |
---|
1545 | ------------------------------------------------------------------------ |
---|
1546 | r2 | $LOGNAME | date | 1 line |
---|
1547 | |
---|
1548 | make tags |
---|
1549 | ------------------------------------------------------------------------ |
---|
1550 | r1 | $LOGNAME | date | 1 line |
---|
1551 | |
---|
1552 | initial trunk import |
---|
1553 | ------------------------------------------------------------------------ |
---|
1554 | __OUT__ |
---|
1555 | file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null |
---|
1556 | #------------------------------------------------------------------------------ |
---|
1557 | # Test the various mergeinfo output after merging. |
---|
1558 | test_mergeinfo "$TEST_KEY_BASE-branch-into-branch-1-post" \ |
---|
1559 | $ROOT_URL/branches/dev/Share/merge1 - 22 <<__RESULTS__ |
---|
1560 | begin-prop |
---|
1561 | /branches/dev/Share/merge1:4-13 |
---|
1562 | /trunk:2-9 |
---|
1563 | end-prop |
---|
1564 | begin-info |
---|
1565 | youngest common ancestor |
---|
1566 | | last full merge |
---|
1567 | | | tip of branch |
---|
1568 | | | | repository path |
---|
1569 | |
---|
1570 | 1 13 22 |
---|
1571 | | | | |
---|
1572 | --| |------------ branches/dev/Share/merge1 |
---|
1573 | ... / \ |
---|
1574 | \ \ |
---|
1575 | --| |------------ branches/dev/Share/merge2 |
---|
1576 | | |
---|
1577 | WC |
---|
1578 | end-info |
---|
1579 | begin-eligible |
---|
1580 | r17 |
---|
1581 | r18 |
---|
1582 | r19 |
---|
1583 | end-eligible |
---|
1584 | begin-merged |
---|
1585 | r4 |
---|
1586 | r5 |
---|
1587 | r10 |
---|
1588 | r11 |
---|
1589 | r13 |
---|
1590 | end-merged |
---|
1591 | __RESULTS__ |
---|
1592 | |
---|
1593 | #------------------------------------------------------------------------------- |
---|
1594 | teardown |
---|
1595 | #------------------------------------------------------------------------------- |
---|