summaryrefslogtreecommitdiff
path: root/t/t9402-git-cvsserver-refs.sh
blob: 2f633319f1cd1a97ef7a4bae4ca343bb262d7364 (plain)
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
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
#!/bin/sh

test_description='git-cvsserver and git refspecs

tests ability for git-cvsserver to switch between and compare
tags, branches and other git refspecs'

. ./test-lib.sh

#########

check_start_tree() {
    rm -f "$WORKDIR/check.list"
    echo "start $1" >>"${WORKDIR}/check.log"
}

check_file() {
    sandbox="$1"
    file="$2"
    ver="$3"
    GIT_DIR=$SERVERDIR git show "${ver}:${file}" \
	>"$WORKDIR/check.got" 2>"$WORKDIR/check.stderr"
    test_cmp "$WORKDIR/check.got" "$sandbox/$file"
    stat=$?
    echo "check_file $sandbox $file $ver : $stat" >>"$WORKDIR/check.log"
    echo "$file" >>"$WORKDIR/check.list"
    return $stat
}

check_end_tree() {
    sandbox="$1" &&
    find "$sandbox" -name CVS -prune -o -type f -print >"$WORKDIR/check.cvsCount" &&
		sort <"$WORKDIR/check.list" >expected &&
		sort <"$WORKDIR/check.cvsCount" | sed -e "s%cvswork/%%" >actual &&
    test_cmp expected actual &&
		rm expected actual
}

check_end_full_tree() {
    sandbox="$1" &&
    sort <"$WORKDIR/check.list" >expected &&
    find "$sandbox" -name CVS -prune -o -type f -print | sed -e "s%$sandbox/%%" | sort >act1 &&
		test_cmp expected act1 &&
    git ls-tree -r "$2" | sed -e "s/^.*blob [0-9a-fA-F]*[	 ]*//" | sort >act2 &&
		test_cmp expected act2 &&
    rm expected act1 act2
}

#########

check_diff() {
    diffFile="$1"
    vOld="$2"
    vNew="$3"
    rm -rf diffSandbox
    git clone -q -n . diffSandbox &&
    ( cd diffSandbox &&
      git checkout "$vOld" &&
      git apply -p0 --index <"../$diffFile" &&
      git diff --exit-code "$vNew" ) >check_diff_apply.out 2>&1
}

#########

cvs >/dev/null 2>&1
if test $? -ne 1
then
    skip_all='skipping git-cvsserver tests, cvs not found'
    test_done
fi
if ! test_have_prereq PERL
then
    skip_all='skipping git-cvsserver tests, perl not available'
    test_done
fi
"$PERL_PATH" -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || {
    skip_all='skipping git-cvsserver tests, Perl SQLite interface unavailable'
    test_done
}

unset GIT_DIR GIT_CONFIG
WORKDIR=$(pwd)
SERVERDIR=$(pwd)/gitcvs.git
git_config="$SERVERDIR/config"
CVSROOT=":fork:$SERVERDIR"
CVSWORK="$(pwd)/cvswork"
CVS_SERVER=git-cvsserver
export CVSROOT CVS_SERVER

rm -rf "$CVSWORK" "$SERVERDIR"
test_expect_success 'setup v1, b1' '
    echo "Simple text file" >textfile.c &&
    echo "t2" >t2 &&
    mkdir adir &&
    echo "adir/afile line1" >adir/afile &&
    echo "adir/afile line2" >>adir/afile &&
    echo "adir/afile line3" >>adir/afile &&
    echo "adir/afile line4" >>adir/afile &&
    echo "adir/a2file" >>adir/a2file &&
    mkdir adir/bdir &&
    echo "adir/bdir/bfile line 1" >adir/bdir/bfile &&
    echo "adir/bdir/bfile line 2" >>adir/bdir/bfile &&
    echo "adir/bdir/b2file" >adir/bdir/b2file &&
    git add textfile.c t2 adir &&
    git commit -q -m "First Commit (v1)" &&
    git tag v1 &&
    git branch b1 &&
    git clone -q --bare "$WORKDIR/.git" "$SERVERDIR" >/dev/null 2>&1 &&
    GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled true &&
    GIT_DIR="$SERVERDIR" git config gitcvs.logfile "$SERVERDIR/gitcvs.log"
'

rm -rf cvswork
test_expect_success 'cvs co v1' '
    cvs -f -Q co -r v1 -d cvswork master >cvs.log 2>&1 &&
    check_start_tree cvswork &&
    check_file cvswork textfile.c v1 &&
    check_file cvswork t2 v1 &&
    check_file cvswork adir/afile v1 &&
    check_file cvswork adir/a2file v1 &&
    check_file cvswork adir/bdir/bfile v1 &&
    check_file cvswork adir/bdir/b2file v1 &&
    check_end_tree cvswork
'

rm -rf cvswork
test_expect_success 'cvs co b1' '
    cvs -f co -r b1 -d cvswork master >cvs.log 2>&1 &&
    check_start_tree cvswork &&
    check_file cvswork textfile.c v1 &&
    check_file cvswork t2 v1 &&
    check_file cvswork adir/afile v1 &&
    check_file cvswork adir/a2file v1 &&
    check_file cvswork adir/bdir/bfile v1 &&
    check_file cvswork adir/bdir/b2file v1 &&
    check_end_tree cvswork
'

test_expect_success 'cvs co b1 [cvswork3]' '
    cvs -f co -r b1 -d cvswork3 master >cvs.log 2>&1 &&
    check_start_tree cvswork3 &&
    check_file cvswork3 textfile.c v1 &&
    check_file cvswork3 t2 v1 &&
    check_file cvswork3 adir/afile v1 &&
    check_file cvswork3 adir/a2file v1 &&
    check_file cvswork3 adir/bdir/bfile v1 &&
    check_file cvswork3 adir/bdir/b2file v1 &&
    check_end_full_tree cvswork3 v1
'

test_expect_success 'edit cvswork3 and save diff' '
    ( cd cvswork3 &&
      sed -e "s/line1/line1 - data/" adir/afile >adir/afileNEW &&
			mv -f adir/afileNEW adir/afile &&
      echo "afile5" >adir/afile5 &&
      rm t2 &&
      cvs -f add adir/afile5 &&
      cvs -f rm t2 &&
      ! cvs -f diff -N -u >"$WORKDIR/cvswork3edit.diff"
    )
'

test_expect_success 'setup v1.2 on b1' '
    git checkout b1 &&
    echo "new v1.2" >t3 &&
    rm t2 &&
    sed -e "s/line3/line3 - more data/" adir/afile >adir/afileNEW &&
		mv -f adir/afileNEW adir/afile &&
    rm adir/a2file &&
    echo "a3file" >>adir/a3file &&
    echo "bfile line 3" >>adir/bdir/bfile &&
    rm adir/bdir/b2file &&
    echo "b3file" >adir/bdir/b3file &&
    mkdir cdir &&
    echo "cdir/cfile" >cdir/cfile &&
    git add -A cdir adir t3 t2 &&
    git commit -q -m 'v1.2' &&
    git tag v1.2 &&
    git push --tags gitcvs.git b1:b1
'

test_expect_success 'cvs -f up (on b1 adir)' '
    ( cd cvswork/adir &&
      cvs -f up -d ) >cvs.log 2>&1 &&
    check_start_tree cvswork &&
    check_file cvswork textfile.c v1 &&
    check_file cvswork t2 v1 &&
    check_file cvswork adir/afile v1.2 &&
    check_file cvswork adir/a3file v1.2 &&
    check_file cvswork adir/bdir/bfile v1.2 &&
    check_file cvswork adir/bdir/b3file v1.2 &&
    check_end_tree cvswork
'

test_expect_success 'cvs up (on b1 /)' '
    ( cd cvswork &&
      cvs -f up -d ) >cvs.log 2>&1 &&
    check_start_tree cvswork &&
    check_file cvswork textfile.c v1.2 &&
    check_file cvswork t3 v1.2 &&
    check_file cvswork adir/afile v1.2 &&
    check_file cvswork adir/a3file v1.2 &&
    check_file cvswork adir/bdir/bfile v1.2 &&
    check_file cvswork adir/bdir/b3file v1.2 &&
    check_file cvswork cdir/cfile v1.2 &&
    check_end_tree cvswork
'

# Make sure "CVS/Tag" files didn't get messed up:
test_expect_success 'cvs up (on b1 /) (again; check CVS/Tag files)' '
    ( cd cvswork &&
      cvs -f up -d ) >cvs.log 2>&1 &&
    check_start_tree cvswork &&
    check_file cvswork textfile.c v1.2 &&
    check_file cvswork t3 v1.2 &&
    check_file cvswork adir/afile v1.2 &&
    check_file cvswork adir/a3file v1.2 &&
    check_file cvswork adir/bdir/bfile v1.2 &&
    check_file cvswork adir/bdir/b3file v1.2 &&
    check_file cvswork cdir/cfile v1.2 &&
    check_end_tree cvswork
'

# update to another version:
test_expect_success 'cvs up -r v1' '
    ( cd cvswork &&
      cvs -f up -r v1 ) >cvs.log 2>&1 &&
    check_start_tree cvswork &&
    check_file cvswork textfile.c v1 &&
    check_file cvswork t2 v1 &&
    check_file cvswork adir/afile v1 &&
    check_file cvswork adir/a2file v1 &&
    check_file cvswork adir/bdir/bfile v1 &&
    check_file cvswork adir/bdir/b2file v1 &&
    check_end_tree cvswork
'

test_expect_success 'cvs up' '
    ( cd cvswork &&
      cvs -f up ) >cvs.log 2>&1 &&
    check_start_tree cvswork &&
    check_file cvswork textfile.c v1 &&
    check_file cvswork t2 v1 &&
    check_file cvswork adir/afile v1 &&
    check_file cvswork adir/a2file v1 &&
    check_file cvswork adir/bdir/bfile v1 &&
    check_file cvswork adir/bdir/b2file v1 &&
    check_end_tree cvswork
'

test_expect_success 'cvs up (again; check CVS/Tag files)' '
    ( cd cvswork &&
      cvs -f up -d ) >cvs.log 2>&1 &&
    check_start_tree cvswork &&
    check_file cvswork textfile.c v1 &&
    check_file cvswork t2 v1 &&
    check_file cvswork adir/afile v1 &&
    check_file cvswork adir/a2file v1 &&
    check_file cvswork adir/bdir/bfile v1 &&
    check_file cvswork adir/bdir/b2file v1 &&
    check_end_tree cvswork
'

test_expect_success 'setup simple b2' '
    git branch b2 v1 &&
    git push --tags gitcvs.git b2:b2
'

test_expect_success 'cvs co b2 [into cvswork2]' '
    cvs -f co -r b2 -d cvswork2 master >cvs.log 2>&1 &&
    check_start_tree cvswork &&
    check_file cvswork textfile.c v1 &&
    check_file cvswork t2 v1 &&
    check_file cvswork adir/afile v1 &&
    check_file cvswork adir/a2file v1 &&
    check_file cvswork adir/bdir/bfile v1 &&
    check_file cvswork adir/bdir/b2file v1 &&
    check_end_tree cvswork
'

test_expect_success 'root dir edit [cvswork2]' '
    ( cd cvswork2 &&
      echo "Line 2" >>textfile.c &&
      ! cvs -f diff -u >"$WORKDIR/cvsEdit1.diff" &&
      cvs -f commit -m "edit textfile.c" textfile.c
    ) >cvsEdit1.log 2>&1
'

test_expect_success 'root dir rm file [cvswork2]' '
    ( cd cvswork2 &&
      cvs -f rm -f t2 &&
      cvs -f diff -u >../cvsEdit2-empty.diff &&
      ! cvs -f diff -N -u >"$WORKDIR/cvsEdit2-N.diff" &&
      cvs -f commit -m "rm t2"
    ) >cvsEdit2.log 2>&1
'

test_expect_success 'subdir edit/add/rm files [cvswork2' '
    ( cd cvswork2 &&
      sed -e "s/line 1/line 1 (v2)/" adir/bdir/bfile >adir/bdir/bfileNEW &&
      mv -f adir/bdir/bfileNEW adir/bdir/bfile &&
      rm adir/bdir/b2file &&
      cd adir &&
      cvs -f rm bdir/b2file &&
      echo "4th file" >bdir/b4file &&
      cvs -f add bdir/b4file &&
      ! cvs -f diff -N -u >"$WORKDIR/cvsEdit3.diff" &&
      git fetch gitcvs.git b2:b2 &&
      ( cd .. &&
	! cvs -f diff -u -N -r v1.2 >"$WORKDIR/cvsEdit3-v1.2.diff" &&
	! cvs -f diff -u -N -r v1.2 -r v1 >"$WORKDIR/cvsEdit3-v1.2-v1.diff"
      ) &&
      cvs -f commit -m "various add/rm/edit"
    ) >cvs.log 2>&1
'

test_expect_success 'validate result of edits [cvswork2]' '
    git fetch gitcvs.git b2:b2 &&
    git tag v2 b2 &&
    git push --tags gitcvs.git b2:b2 &&
    check_start_tree cvswork2 &&
    check_file cvswork2 textfile.c v2 &&
    check_file cvswork2 adir/afile v2 &&
    check_file cvswork2 adir/a2file v2 &&
    check_file cvswork2 adir/bdir/bfile v2 &&
    check_file cvswork2 adir/bdir/b4file v2 &&
    check_end_full_tree cvswork2 v2
'

test_expect_success 'validate basic diffs saved during above cvswork2 edits' '
    test $(grep Index: cvsEdit1.diff | wc -l) = 1 &&
    test ! -s cvsEdit2-empty.diff &&
    test $(grep Index: cvsEdit2-N.diff | wc -l) = 1 &&
    test $(grep Index: cvsEdit3.diff | wc -l) = 3 &&
    rm -rf diffSandbox &&
    git clone -q -n . diffSandbox &&
    ( cd diffSandbox &&
      git checkout v1 &&
      git apply -p0 --index <"$WORKDIR/cvsEdit1.diff" &&
      git apply -p0 --index <"$WORKDIR/cvsEdit2-N.diff" &&
      git apply -p0 --directory=adir --index <"$WORKDIR/cvsEdit3.diff" &&
      git diff --exit-code v2 ) >"check_diff_apply.out" 2>&1
'

test_expect_success 'validate v1.2 diff saved during last cvswork2 edit' '
    test $(grep Index: cvsEdit3-v1.2.diff | wc -l) = 9 &&
    check_diff cvsEdit3-v1.2.diff v1.2 v2
'

test_expect_success 'validate v1.2 v1 diff saved during last cvswork2 edit' '
    test $(grep Index: cvsEdit3-v1.2-v1.diff | wc -l) = 9 &&
    check_diff cvsEdit3-v1.2-v1.diff v1.2 v1
'

test_expect_success 'cvs up [cvswork2]' '
    ( cd cvswork2 &&
      cvs -f up ) >cvs.log 2>&1 &&
    check_start_tree cvswork2 &&
    check_file cvswork2 textfile.c v2 &&
    check_file cvswork2 adir/afile v2 &&
    check_file cvswork2 adir/a2file v2 &&
    check_file cvswork2 adir/bdir/bfile v2 &&
    check_file cvswork2 adir/bdir/b4file v2 &&
    check_end_full_tree cvswork2 v2
'

test_expect_success 'cvs up -r b2 [back to cvswork]' '
    ( cd cvswork &&
      cvs -f up -r b2 ) >cvs.log 2>&1 &&
    check_start_tree cvswork &&
    check_file cvswork textfile.c v2 &&
    check_file cvswork adir/afile v2 &&
    check_file cvswork adir/a2file v2 &&
    check_file cvswork adir/bdir/bfile v2 &&
    check_file cvswork adir/bdir/b4file v2 &&
    check_end_full_tree cvswork v2
'

test_expect_success 'cvs up -r b1' '
    ( cd cvswork &&
      cvs -f up -r b1 ) >cvs.log 2>&1 &&
    check_start_tree cvswork &&
    check_file cvswork textfile.c v1.2 &&
    check_file cvswork t3 v1.2 &&
    check_file cvswork adir/afile v1.2 &&
    check_file cvswork adir/a3file v1.2 &&
    check_file cvswork adir/bdir/bfile v1.2 &&
    check_file cvswork adir/bdir/b3file v1.2 &&
    check_file cvswork cdir/cfile v1.2 &&
    check_end_full_tree cvswork v1.2
'

test_expect_success 'cvs up -A' '
    ( cd cvswork &&
      cvs -f up -A ) >cvs.log 2>&1 &&
    check_start_tree cvswork &&
    check_file cvswork textfile.c v1 &&
    check_file cvswork t2 v1 &&
    check_file cvswork adir/afile v1 &&
    check_file cvswork adir/a2file v1 &&
    check_file cvswork adir/bdir/bfile v1 &&
    check_file cvswork adir/bdir/b2file v1 &&
    check_end_full_tree cvswork v1
'

test_expect_success 'cvs up (check CVS/Tag files)' '
    ( cd cvswork &&
      cvs -f up ) >cvs.log 2>&1 &&
    check_start_tree cvswork &&
    check_file cvswork textfile.c v1 &&
    check_file cvswork t2 v1 &&
    check_file cvswork adir/afile v1 &&
    check_file cvswork adir/a2file v1 &&
    check_file cvswork adir/bdir/bfile v1 &&
    check_file cvswork adir/bdir/b2file v1 &&
    check_end_full_tree cvswork v1
'

# This is not really legal CVS, but it seems to work anyway:
test_expect_success 'cvs up -r heads/b1' '
    ( cd cvswork &&
      cvs -f up -r heads/b1 ) >cvs.log 2>&1 &&
    check_start_tree cvswork &&
    check_file cvswork textfile.c v1.2 &&
    check_file cvswork t3 v1.2 &&
    check_file cvswork adir/afile v1.2 &&
    check_file cvswork adir/a3file v1.2 &&
    check_file cvswork adir/bdir/bfile v1.2 &&
    check_file cvswork adir/bdir/b3file v1.2 &&
    check_file cvswork cdir/cfile v1.2 &&
    check_end_full_tree cvswork v1.2
'

# But this should work even if CVS client checks -r more carefully:
test_expect_success 'cvs up -r heads_-s-b2 (cvsserver escape mechanism)' '
    ( cd cvswork &&
      cvs -f up -r heads_-s-b2 ) >cvs.log 2>&1 &&
    check_start_tree cvswork &&
    check_file cvswork textfile.c v2 &&
    check_file cvswork adir/afile v2 &&
    check_file cvswork adir/a2file v2 &&
    check_file cvswork adir/bdir/bfile v2 &&
    check_file cvswork adir/bdir/b4file v2 &&
    check_end_full_tree cvswork v2
'

v1hash=$(git rev-parse v1)
test_expect_success 'cvs up -r $(git rev-parse v1)' '
    test -n "$v1hash" &&
    ( cd cvswork &&
      cvs -f up -r "$v1hash" ) >cvs.log 2>&1 &&
    check_start_tree cvswork &&
    check_file cvswork textfile.c v1 &&
    check_file cvswork t2 v1 &&
    check_file cvswork adir/afile v1 &&
    check_file cvswork adir/a2file v1 &&
    check_file cvswork adir/bdir/bfile v1 &&
    check_file cvswork adir/bdir/b2file v1 &&
    check_end_full_tree cvswork v1
'

test_expect_success 'cvs diff -r v1 -u' '
    ( cd cvswork &&
      cvs -f diff -r v1 -u ) >cvsDiff.out 2>cvs.log &&
    test ! -s cvsDiff.out &&
    test ! -s cvs.log
'

test_expect_success 'cvs diff -N -r v2 -u' '
    ( cd cvswork &&
      ! cvs -f diff -N -r v2 -u ) >cvsDiff.out 2>cvs.log &&
    test ! -s cvs.log &&
    test -s cvsDiff.out &&
    check_diff cvsDiff.out v2 v1 >check_diff.out 2>&1
'

test_expect_success 'cvs diff -N -r v2 -r v1.2' '
    ( cd cvswork &&
      ! cvs -f diff -N -r v2 -r v1.2 -u ) >cvsDiff.out 2>cvs.log &&
    test ! -s cvs.log &&
    test -s cvsDiff.out &&
    check_diff cvsDiff.out v2 v1.2 >check_diff.out 2>&1
'

test_expect_success 'apply early [cvswork3] diff to b3' '
    git clone -q . gitwork3 &&
    ( cd gitwork3 &&
      git checkout -b b3 v1 &&
      git apply -p0 --index <"$WORKDIR/cvswork3edit.diff" &&
      git commit -m "cvswork3 edits applied" ) &&
    git fetch gitwork3 b3:b3 &&
    git tag v3 b3
'

test_expect_success 'check [cvswork3] diff' '
    ( cd cvswork3 &&
      ! cvs -f diff -N -u ) >"$WORKDIR/cvsDiff.out" 2>cvs.log &&
    test ! -s cvs.log &&
    test -s cvsDiff.out &&
    test $(grep Index: cvsDiff.out | wc -l) = 3 &&
    test_cmp cvsDiff.out cvswork3edit.diff &&
    check_diff cvsDiff.out v1 v3 >check_diff.out 2>&1
'

test_expect_success 'merge early [cvswork3] b3 with b1' '
    ( cd gitwork3 &&
      git merge "message" HEAD b1 )
    git fetch gitwork3 b3:b3 &&
    git tag v3merged b3 &&
    git push --tags gitcvs.git b3:b3
'

# This test would fail if cvsserver properly created a ".#afile"* file
# for the merge.
# TODO: Validate that the .# file was saved properly, and then
#   delete/ignore it when checking the tree.
test_expect_success 'cvs up dirty [cvswork3]' '
    ( cd cvswork3 &&
      cvs -f up &&
      ! cvs -f diff -N -u >"$WORKDIR/cvsDiff.out" ) >cvs.log 2>&1 &&
    test -s cvsDiff.out &&
    test $(grep Index: cvsDiff.out | wc -l) = 2
    check_start_tree cvswork3 &&
    check_file cvswork3 textfile.c v3merged &&
    check_file cvswork3 t3 v3merged &&
    check_file cvswork3 adir/afile v3merged &&
    check_file cvswork3 adir/a3file v3merged &&
    check_file cvswork3 adir/afile5 v3merged &&
    check_file cvswork3 adir/bdir/bfile v3merged &&
    check_file cvswork3 adir/bdir/b3file v3merged &&
    check_file cvswork3 cdir/cfile v3merged &&
    check_end_full_tree cvswork3 v3merged
'

# TODO: test cvs status

test_expect_success 'cvs commit [cvswork3' '
    ( cd cvswork3 &&
      cvs -f commit -m "dirty sandbox after auto-merge"
    ) >cvs.log 2>&1 &&
    check_start_tree cvswork3 &&
    check_file cvswork3 textfile.c v3merged &&
    check_file cvswork3 t3 v3merged &&
    check_file cvswork3 adir/afile v3merged &&
    check_file cvswork3 adir/a3file v3merged &&
    check_file cvswork3 adir/afile5 v3merged &&
    check_file cvswork3 adir/bdir/bfile v3merged &&
    check_file cvswork3 adir/bdir/b3file v3merged &&
    check_file cvswork3 cdir/cfile v3merged &&
    check_end_full_tree cvswork3 v3merged &&
    git fetch gitcvs.git b3:b4 &&
    git tag v4.1 b4 &&
    git diff --exit-code v4.1 v3merged >check_diff_apply.out 2>&1
'

test_done