>
> Hmm, couldn't that be done on a copy, so it would not upset cvs? If I
> would be doing a patch using cvs diff I would have to remove my local
> perl location so I do not accidently distribute a patch with the wrong
> defaults. For example embpcgi.bat could be named embpcgi.bat.template
> in cv
>Makefile.PL inserts the correct path to your perl binary in the first line,
>i.e.
>
>#!/usr/bin/perl
>
>or whatever it is on your system
>
>So that CVS behaviour is quite allright
Hmm, couldn't that be done on a copy, so it would not upset cvs? If I
would be doing a patch using cvs diff I would
Hi,
>
> I do get the newest version of Embperl via cvs upd and every time I do
> that I get conflicts:
>
> RCS file: /home/cvspublic/embperl/embpcgi.bat,v
> ...
> Is there a special reason that these files are modified locally during
> the configuration/make cycle so these conflicts are happening
Hi,
I do get the newest version of Embperl via cvs upd and every time I do
that I get conflicts:
RCS file: /home/cvspublic/embperl/embpcgi.bat,v
retrieving revision 1.8
retrieving revision 1.10
Merging differences between 1.8 and 1.10 into embpcgi.bat
rcsmerge: warning: conflicts during merge
cv
