Re: Merging bug (wrong conflicts)

2001-02-08 Thread Jacob Burckhardt
Karl Tomlinson writes: > "Derek R. Price" wrote: > > > > > Karl, do you know what, specifically, was causing the merging problems? > > I can't come up with a minimal test case based on the message and comments in > > your patch. > > > > I'm thinking that the eight cases Jacob has might all be ex

Re: Merging bug (wrong conflicts)

2001-02-08 Thread Karl Tomlinson
"Derek R. Price" wrote: > > > Karl, do you know what, specifically, was causing the merging problems? > I can't come up with a minimal test case based on the message and comments in > your patch. > > I'm thinking that the eight cases Jacob has might all be examples of only a > few or even one er

Re: Bug in patch 2.5.4 or its documentation

2001-02-08 Thread Derek R. Price
"Derek R. Price" wrote: > As near as I can read the man page, files should be created by patch if the > original is listed as /dev/null or is empty and has a creation time of the Epoch > (1970-01-01 00:00:00 UTC), regardless of whether --posix has been specified (it > claims --posix will cause

Bug in patch 2.5.4 or its documentation

2001-02-08 Thread Derek R. Price
As near as I can read the man page, files should be created by patch if the original is listed as /dev/null or is empty and has a creation time of the Epoch (1970-01-01 00:00:00 UTC), regardless of whether --posix has been specified (it claims --posix will cause patch to conform to the POSIX.2 s

Re: (no subject)

2001-02-08 Thread Larry Jones
[EMAIL PROTECTED] writes: > > >Description: > If cvs run's as server and HOME directory of root is without read access > for the user, export does not work any more. http://www.cvshome.org/docs/manual/cvs_21.html#SEC182 You're missing the ``-f'' in the CVS command in /etc/inetd.conf.

Re: cvs diff and added files

2001-02-08 Thread Derek R. Price
Karl Fogel wrote: > Hmmm. If CVS produced a patch where the `diff', `---', and `+++' > lines gave the path to the filename, would patch then behave the way > you want? Yes it would. I'm not sure all three locations are necessary, but that's what I've been doing and that is what the example on

Re: cvs diff and added files

2001-02-08 Thread Ian Lance Taylor
"Derek R. Price" <[EMAIL PROTECTED]> writes: > According to my patch man page, it appears CVS is relying on some POSIX > behavior which tells patch to read the filename on the 'Index:' line and not > the later 'diff', '---', and '+++' lines. Unfortunately, my implementation > of patch appears to

Re: cvs diff and added files

2001-02-08 Thread Derek R. Price
Ian Lance Taylor wrote: > "Derek R. Price" <[EMAIL PROTECTED]> writes: > > > According to my patch man page, it appears CVS is relying on some POSIX > > behavior which tells patch to read the filename on the 'Index:' line and not > > the later 'diff', '---', and '+++' lines. Unfortunately, my im

Re: cvs diff and added files

2001-02-08 Thread Karl Fogel
Hmmm. If CVS produced a patch where the `diff', `---', and `+++' lines gave the path to the filename, would patch then behave the way you want? But would this break patches in some other way? The question is, what is the standard diff format by which patch will correctly apply changes, and add

Re: cvs diff and added files

2001-02-08 Thread Derek R. Price
Karl Fogel wrote: > "Derek R. Price" <[EMAIL PROTECTED]> writes: > > Is there a good reason that 'cvs diff' (with at least unified format) of > > a repository containing added files creates a file that when run through > > patch creates the new files at the top level regardless of their > > origi

Re: cvs diff and added files

2001-02-08 Thread Karl Fogel
"Derek R. Price" <[EMAIL PROTECTED]> writes: > Is there a good reason that 'cvs diff' (with at least unified format) of > a repository containing added files creates a file that when run through > patch creates the new files at the top level regardless of their > original location? I think maybe

Re: Merging bug (wrong conflicts)

2001-02-08 Thread Derek R. Price
Karl Tomlinson wrote: > Thanks very much for your feedback. > Pleased to hear that things are working. > It seems from Derek's post that the most urgent thing required to > get this into the official cvs is some test cases. > I would be grateful it if you could set up some of these. > I had thoug

cvs diff and added files

2001-02-08 Thread Derek R. Price
Is there a good reason that 'cvs diff' (with at least unified format) of a repository containing added files creates a file that when run through patch creates the new files at the top level regardless of their original location? Derek -- Derek Price CVS Solutions Architect

(no subject)

2001-02-08 Thread reiner_laib
>Submitter-Id: net >Originator: Reiner Laib >Organization: Agilent Technologies net >Confidential: no >Synopsis: export don't work >Severity: non-critical >Priority: medium >Category: cvs >Class: sw-bug >Release: cvs-1.10.8 >Environment: