Xref: utzoo comp.sources.d:6695 comp.sys.3b1:883
Path: utzoo!utgpu!news-server.csri.toronto.edu!rpi!zaphod.mps.ohio-state.edu!think.com!masscomp!ocpt!tsdiag!hico2!kak
From: kak@hico2.UUCP (Kris A. Kugel)
Newsgroups: comp.sources.d,comp.sys.3b1
Subject: problems with diff3 in RCS:rcstest
Keywords: diff3 rcs rcstest 7300 3b1 unixpc
Message-ID: <1345@hico2.UUCP>
Date: 25 Mar 91 21:43:07 GMT
Reply-To: kak@hico2.westmark.com
Followup-To: comp.sources.d,comp.sys.3b1
Organization: High Country Software
Lines: 42

I'm trying to get the recently posted RCS package to work on my 3b1.
I've installed the recently posted gnu diff package said make the
RCS package work correctly.
Now I'm trying to get RCS to pass the rcstest test included
in the RCS package.

I've gotten it working (with some minor adjustment to rcstest)
until it trys an rcsmerge.  output from rcstest -v:
. . . .
+ rcsmerge -r2.2 -r2.3 a.c 
RCS file: RCS/a.c,v
retrieving revision 2.2
retrieving revision 2.3
Merging differences between 2.2 and 2.3 into a.c
Usage:	/usr/bin/diff3 [-exEX3 [-i | -m] [-L label1 -L label3]] file1 file2 file3
	Only one of [exEX3] allowed
merge: overlaps or other problems during merge

[ rcs merge then fails ]


It sure looks like diff3 is not getting the parameters it's expecting.
To find out what parameters it IS getting, I temporarily replaced
/usr/bin/diff3 with a program that prints out its arguments,
and re-typed the rcsmerge command:
RCS file: RCS/a.c,v
retrieving revision 2.2
retrieving revision 2.3
Merging differences between 2.2 and 2.3 into a.c
 "/usr/bin/diff3" "-E" "/tmp/d3a10103" "/tmp/d3b10103" "a.c" "/tmp/RCSAa10100" "/tmp/RCSBa10100" "a.c" "2.3"

Since I don't have a manual page for diff3, I have no idea how
the diff3 command is supposed to work here.
These arguements don't look right.

Does anybody know how to fix this problem?

                               Kris A. Kugel
                             ( 908 ) 842-2707
                      uunet!tsdiag.ccur.com!hico2!kak
                        {daver,ditka,zorch}!hico2!kak
                      internet: kak@hico2.westmark.com