On Tue, Feb 22, 2000 at 07:50:24PM +0530, Sankaranarayanan K V wrote:
> Hi,
>
> I am using CVS 1.10.7 on Solaris 2.5.1.
>
> I am trying to make the HEAD of a branch B1 the same as that of another
> branch B2 by:
>
> cd <B1 sand box>
> cvs update -j B1 -j B2
>
> This should NOT give me any conflicts.
>
> But I do get conflicts in some cases -- I don't know why.
>
> I tried to duplicate the problem so that I can send the exact sequence
> of commands and file contents; but I could not.
Some breakthrough!
I tried to duplicate the problem with partial success.
I copied the offending files (RCS ones from the repository) to a
separate repository and tried to recreate the problem.
The problem is present ONLY in pserver access.
There are no problems in local access.
I don't know whether this could be the problem but please let me know:
For pserver access, I am using the following setup:
In, inetd.conf I have:
cvsremote stream tcp nowait root /users/cvsadmin/bin/cvsremote cvsremote
where cvsremote is a perl script:
#!/users/cvsadmin/bin/perl -w # -*-perl-*-
$rootsfile = '/users/cvsadmin/data/allowedroots';
$logfile = '/users/cvsadmin/log/cvsremote.log';
open OUT, ">>$logfile";
$now = localtime;
print OUT "----\n";
print OUT "$now\n";
print OUT "args are: ", join " ", @ARGV;
print OUT "\n";
close OUT;
$realcvs = '/users/cvsadmin/bin/cvs';
@allowedroots = `/bin/cat $rootsfile`;
chomp(@allowedroots);
exec $realcvs 'cvs',
@allowedroots,
'pserver', @ARGV;
# end of file
The reason for this setup is to keep the allowed roots under control of
the user cvsadmin. You don't need to bug the sysadmin every time you
want to experiment with some feature of pserver with a different repository.
Could this create any problem?
This setup has NOT created any problems for me.
Regards
Sankar
