1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
|
#! /bin/sh
# sf479916.sh: Tests for SourceForge bug 479916,
# which relates to correct selection of
# a delta from a branch when the -t flag is
# used.
# Import common functions & definitions.
. ../common/test-common
g=X
s=s.$g
x=x.$g
z=z.$g
p=p.$g
remove $g $s $x $z $p
echo "%Z%" > $g
echo "%Z%" >> $g
docommand prep1 "${admin} -fb -i$g $s" 0 IGNORE IGNORE
remove $g
docommand prep2 "${get} -e -b -t $s" 0 "1.1
new delta 1.1.1.1
2 lines
" IGNORE
docommand prep3 "${delta} -yNoComment $s" 0 IGNORE IGNORE
docommand prep4 "${get} -e -b -t $s" 0 "1.1.1.1
new delta 1.1.2.1
2 lines
" IGNORE
docommand prep5 "${delta} -yNoComment $s" 0 IGNORE IGNORE
# Now for the actual test - the "-t" option should pich the
# most recent delata, which is 1.1.2.1, not 1.1.1.1.
docommand T1 "${get} -t $s" 0 "1.1.2.1
2 lines
" IGNORE
# Create another trunk delta
docommand prep6 "${get} -e $s" 0 "1.1
new delta 1.2
2 lines
" IGNORE
docommand prep7 "${delta} -yNoComment $s" 0 IGNORE IGNORE
docommand T2 "${get} -t $s" 0 "1.2
2 lines
" IGNORE
docommand T3 "${get} $s" 0 "1.2
2 lines
" IGNORE
# Add another release.
docommand prep8 "${get} -r2 -e $s" 0 "1.2
new delta 2.1
2 lines
" IGNORE
docommand prep9 "${delta} -yNoComment $s" 0 IGNORE IGNORE
# ... and another branch off 1.2.
docommand prep10 "${get} -r1.2 -e $s" 0 "1.2
new delta 1.2.1.1
2 lines
" IGNORE
docommand prep11 "${delta} -yNoComment $s" 0 IGNORE IGNORE
docommand T4 "${get} -t -r2 $s" 0 "2.1
2 lines
" IGNORE
docommand T5 "${get} -t -r2.1 $s" 0 "2.1
2 lines
" IGNORE
docommand T6 "${get} -r2.1 $s" 0 "2.1
2 lines
" IGNORE
docommand T7 "${get} -t $s" 0 "2.1
2 lines
" IGNORE
docommand T8 "${get} -t -r1 $s" 0 "1.2.1.1
2 lines
" IGNORE
docommand T9 "${get} -t -r1.1 $s" 0 "1.1.2.1
2 lines
" IGNORE
docommand T10 "${get} -t -r1.1.1 $s" 0 "1.1.1.1
2 lines
" IGNORE
docommand T11 "${get} -t -r1.1.2 $s" 0 "1.1.2.1
2 lines
" IGNORE
docommand T12 "${get} -t -r1.1.1.1 $s" 0 "1.1.1.1
2 lines
" IGNORE
docommand T13 "${get} -t -r1.1.2.1 $s" 0 "1.1.2.1
2 lines
" IGNORE
remove $g $s $x $z $p
success
|
