Re: join not producing conflict

[Mark D. Baushke]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Derek Robert Price <derek@ximbiot.com> writes:

> |+      cp temp2.txt temp.txt
> |+      dotest join6-10 "${testcvs} -q ci -m del temp.txt" \
> |+"Checking in temp\.txt;
> |+${CVSROOT_DIRNAME}/join6/temp.txt,v  <--  temp\.txt
> |+new revision: 1\.3; previous revision: 1\.2
> |+done"
> |+      dotest join6-11 "${testcvs} diff temp.txt" ""
> |+      dotest join6-12 "cmp temp2.txt temp.txt" ""
> 
> 
> Looks good, but why the last `cvs diff' and cmp?  These look like
> truisms that should have already been tested for in a commit and/or diff
> test - 1.  after a successful commit, of course the diff against the
> base revision is empty, and 2. of course commit didn't change the
> contents of temp.txt.

Grrr... somehow I e-mailed the wrong diff to you.

The join6-11 and join6-12 tests should have been replaced with the
following:

          cp temp3.txt temp.txt
          dotest_fail join6-11 "${testcvs} diff temp.txt" \
"Index: temp\.txt
===================================================================
RCS file: ${CVSROOT_DIRNAME}/join6/temp.txt,v
retrieving revision 1\.3
diff -r1\.3 temp\.txt
3a4
> ddd"
          dotest join6-12 "${testcvs} update -j1.2 -j1.3 temp.txt" \
"M temp\.txt
RCS file: ${CVSROOT_DIRNAME}/join6/temp\.txt,v
retrieving revision 1\.2
retrieving revision 1\.3
Merging differences between 1\.2 and 1\.3 into temp\.txt"
          dotest join6-13 "${testcvs} diff temp.txt" ""

The intent is to ensure that the patch does silently remove a line if
that is what the merge operation needs to do. So, in summary, join6 does
an add, conflict, and remove of a line of text to see if the right thing
happens.

        Thanks,
        -- Mark
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (FreeBSD)

iD8DBQE/lsPO3x41pRYZE/gRAvpSAKDZvV1JYOEHhWqvEwtkNh0NoOHGBwCcDkUt
bUGRc6U3jGx6k7SYAzkf9FY=
=oiyL
-----END PGP SIGNATURE-----