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
|
#! /bin/sh
# included.sh: Tests for included deltas.
# Import common functions & definitions.
. ../common/test-common
g=gfile
s=s.$g
x=x.$g
z=z.$g
p=p.$g
remove $g $s $x $z $p
# create an empty history file.
echo "seq=1 1.1" > $g
docommand C1 "$admin -i$g $s" 0 "" IGNORE
remove $g
# Put some versions on the trunk.
docommand I2 "$get -s -e $s" 0 IGNORE IGNORE
echo "seq=2 1.2" >> $g
docommand I3 "$delta -y $s" 0 IGNORE IGNORE
docommand I4 "$get -s -e $s" 0 IGNORE IGNORE
echo "seq=3 1.3" >> $g
docommand I5 "$delta -y $s" 0 IGNORE IGNORE
docommand I6 "$get -s -e $s" 0 IGNORE IGNORE
echo "seq=4 1.4" >> $g
docommand I7 "$delta -y $s" 0 IGNORE IGNORE
docommand I8 "$get -s -e $s" 0 IGNORE IGNORE
echo "seq=5 1.5" >> $g
docommand I9 "$delta -y $s" 0 IGNORE IGNORE
docommand I10 "$get -s -e $s" 0 IGNORE IGNORE
echo "seq=6 1.6" >> $g
docommand I11 "$delta -y $s" 0 IGNORE IGNORE
docommand I12 "$get -s -e $s" 0 IGNORE IGNORE
echo "seq=7 1.7" >> $g
docommand I13 "$delta -y $s" 0 IGNORE IGNORE
# Create a branch.
docommand B1 "$get -s -e -r1.2 $s" 0 IGNORE IGNORE
## docommand B2 "mv $g $g.old" 0 IGNORE IGNORE
## docommand B3 "sed -e '1 a\\
## seq=8 1.2.1.1' < $g.old > $g" 0 IGNORE IGNORE
## remove $g.old
# SourceForge bug number 441423: on NetBSD-1.5W, the sed "a" command
# appears to eat the newline. Hence we replace the old single-step
# sed command above with the three-step approach below.
(
mv $g $g.old &&
sed -n -e '1p' < $g.old > $g &&
echo "seq=8 1.2.1.1" >> $g &&
sed -n -e '2,$ p' < $g.old >> $g &&
remove $g.old
) || miscarry "Failed to prepare new version of $g"
docommand I14 "$delta -y $s" 0 IGNORE IGNORE
# Add to the head of the revision tree a delta which includes the
# delta we just made.
docommand I14 "$get -s -e -i1.2.1.1 $s" 0 IGNORE IGNORE
docommand I15 "$delta -y $s" 0 IGNORE IGNORE
# Make sure we get the right result...
docommand I16 "$get -s -p $s" 0 \
"seq=1 1.1\nseq=8 1.2.1.1\nseq=2 1.2\nseq=3 1.3\nseq=4 1.4\nseq=5 1.5\nseq=6 1.6\nseq=7 1.7\n" IGNORE
remove $g $s $x $z $p
success
|
