bug-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: cvs diff -uN - issue


From: J. Grant
Subject: Re: cvs diff -uN - issue
Date: Tue, 11 Mar 2003 20:37:31 +0000
User-agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.3a) Gecko/20021212

Hi Mark,

Thank you for the swift reply.

on the 10/03/03 17:50, Mark D. Baushke wrote:
J. Grant <address@hidden> writes:

I have not heard anything back from my last email to the
address@hidden address, so I hope you might be able to address this issue.

Using 1.11.5 server, and 1.11.2 client does not support "cvs diff -uN"
correctly. No New files are included in the diff.

? README.PS2Linux
? src/joystick/ps2linux
? test/testactuator.c

There are two files and one directory with files inside I need to add.

I can not "cvs add" or "cvs import" because I do not have an CVS
account, I am only a contributer.

A "cvs add" of a directory does you be able to have permission to commit
a new directory in the repository.

The "cvs diff -uN" will only diff files that are in your current tree
that cvs has been told about. These are either files that are cvs
already knew about when you did the checkout or files that you have told
it about via a "cvs add" command.

If you have other files in your tree, cvs will ignore them. This is
intentional.
Is this a known issue? Is there a patch for this?

You should be able to "cvs add" new files to your tree even without the
ability to commit them to the repository as this is a local operation.

These are the commands I have tested with:


$ cvs -d :pserver:address@hidden:/home/sdlweb/libsdl.org/cvs login
$ cvs -z3 -d :pserver:address@hidden:/home/sdlweb/libsdl.org/cvs checkout SDL12
<snip>
$ cd SDL12
$ cvs add README.PS2Linux
cvs [server aborted]: "add" requires write access to the repository
$ ll README.PS2Linux
-rwxr--r--    1 now3d    now3d         683 Mar  5 12:08 README.PS2Linux*


I can not see why "cvs add" does not work as a local operation in my case. Could you test this yourself and see if you also encounter this problem please?



For the new directory, well, you could just do something like:

    cvs diff -uNp > my-cvs.diffs
    mkdir empty-directory
    diff -uN empty-directory new-directory > my-new-directory.diffs

and then massage the output of the two .diffs files into a single file
for submission to whoever needs the patch.

Thanks, i managed to get a working patch using this method with -X SDL12/.cvsignore

Cheers

JG





reply via email to

[Prev in Thread] Current Thread [Next in Thread]