cvs diff: list unknown files with question mark
Hello, When developing using Drupal's CVS repository, if we do: cvs diff -up > new.patch at the top of the diff output, there are as many lines (starting with a question mark) as there are files in the local checkout that do not exist in the repository. Often, other patches would be listed: ? 1234.patch ? 98734.patch ? TODO.txt and then comes the diff output proper. I have a local cvs repository for my own development work. However, when I do cvs diff -up against my local repository, the unknown files are not listed as with Drupal's repository. There must be a configuration option somewhere, but I cannot find it. I've looked at the cvs official documentation, I've searched the web... but I cannot find the answer. I hope someone has the answer because it's a very useful feature. thanks, Augustin.
augustin (beginner) wrote:
Hello,
When developing using Drupal's CVS repository, if we do: cvs diff -up > new.patch at the top of the diff output, there are as many lines (starting with a question mark) as there are files in the local checkout that do not exist in the repository. Often, other patches would be listed:
? 1234.patch ? 98734.patch ? TODO.txt
and then comes the diff output proper. Those are simply files that the CVS repository doesn't know about. They shouldn't cause any problems with the patch, but you can always edit them out if you want.
Cheers, Jonathan -- Jonathan Hedstrom OpenSourcery http://opensourcery.com Technology for Good
On Thursday 10 July 2008 00:29:59 Jonathan Hedstrom wrote:
? 1234.patch ? 98734.patch ? TODO.txt
and then comes the diff output proper.
Those are simply files that the CVS repository doesn't know about. They shouldn't cause any problems with the patch, but you can always edit them out if you want.
I know that. I still would like to have them listed. It is useful to know which new files we have that we forgot to add (cvs add file) or which file we have that we don't intend to commit. So, the question remains: how can I configure CVS so that those files are listed at the top of the patch, just like they are with Drupal CVS? Thanks, Augustin.
augustin (beginner) wrote:
On Thursday 10 July 2008 00:29:59 Jonathan Hedstrom wrote:
? 1234.patch ? 98734.patch ? TODO.txt
So, the question remains: how can I configure CVS so that those files are listed at the top of the patch, just like they are with Drupal CVS?
Hi Augustin, I've never known CVS not to do that ... but perhaps if you could tell us a little about your setup it might help us help you .. Windows/Mac/Linux ? Which version of cvs do you have? Are you sure these files are neither in cvs - nor been cvsignore'd ?? -- Sean Burlington www.practicalweb.co.uk
On Thursday 10 July 2008 16:13:48 Sean Burlington wrote:
I've never known CVS not to do that ...
but perhaps if you could tell us a little about your setup it might help us help you ..
Windows/Mac/Linux ?
Which version of cvs do you have?
Are you sure these files are neither in cvs - nor been cvsignore'd ??
Thanks Sean and Earnie for your follow ups. I am using the latest version of Kubuntu (2008.4) $ cvs -v Concurrent Versions System (CVS) 1.12.13 (client/server) though the repository itself (also on my local computer) is a bit older (~2 years old). It was set up using an older version of Mandriva. Maybe I can compare the default configuration files of a fresh Ubuntu cvs install with what I have now... It's a long shot but I don't have anything better right now. Only the repository is older, though. I have recently reinstalled the OS, so the configuration files server site are the default ones for a new Ubuntu, and the user is a new one, too, so the configuration file in the user's home directory would be a recent default, too. Still, I'll check them... No, the files are not being cvsignored. It's my own repository and I've never used that feature. I can create a new file right now (vi test.txt) and it will not show up in the diff. As to CVS not known to do that... my research on the web has convinced me that my situation is not common, but not unique either. Whenever I read a manual or a tutorial somewhere, the author assumes that those files will be shown with a question mark in front of them. However, I came across a long thread started by someone who asked exactly the same question. Unfortunately, the thread went off a tangent and the guy never received an answer... Even though you might not have the answer, I appreciate that you tried to help out (including Jonathan, earlier). Thanks. Blessings, Augustin.
Quoting "augustin (beginner)" <drupal.beginner@wechange.org>:
On Thursday 10 July 2008 16:13:48 Sean Burlington wrote:
I've never known CVS not to do that ...
but perhaps if you could tell us a little about your setup it might help us help you ..
Windows/Mac/Linux ?
Which version of cvs do you have?
Are you sure these files are neither in cvs - nor been cvsignore'd ??
Thanks Sean and Earnie for your follow ups.
I am using the latest version of Kubuntu (2008.4)
$ cvs -v Concurrent Versions System (CVS) 1.12.13 (client/server)
What about an aliased cvs command? What is the output of ``alias cvs''? Earnie -- http://for-my-kids.com/ -- http://give-me-an-offer.com/
or some kind of global CVSIGNORE thingie? On Sun, Jul 13, 2008 at 12:16 PM, Earnie Boyd <earnie@users.sourceforge.net> wrote:
Quoting "augustin (beginner)" <drupal.beginner@wechange.org>:
On Thursday 10 July 2008 16:13:48 Sean Burlington wrote:
I've never known CVS not to do that ...
but perhaps if you could tell us a little about your setup it might help us help you ..
Windows/Mac/Linux ?
Which version of cvs do you have?
Are you sure these files are neither in cvs - nor been cvsignore'd ??
Thanks Sean and Earnie for your follow ups.
I am using the latest version of Kubuntu (2008.4)
$ cvs -v Concurrent Versions System (CVS) 1.12.13 (client/server)
What about an aliased cvs command?
What is the output of ``alias cvs''?
Earnie -- http://for-my-kids.com/ -- http://give-me-an-offer.com/
-- [ Drupal support list | http://lists.drupal.org/ ]
Hi, Thanks again. $ echo $CVSIGNORE returns nothing. I checked in the CVSROOT directory, and couldn't find any setting related to diff output: I grepped for diff, ignore, IGNORE, etc. but no positive result. $ alias cvs bash: alias: cvs: not found $ alias alias la='ls -A' alias ll='ls -l' alias ls='ls --color=auto' (cool. I didn't know alias. I learned something. thanks). $ which cvs /usr/bin/cvs $ cvs -f diff -up returns the same patch as without -f. I think I'll take this up to the official cvs mailing list. Hopefully it's still active enough that someone will be able to help me. Thanks for trying. :) Blessins, Augustin.
Quoting Earnie Boyd <earnie@users.sourceforge.net>:
Quoting "augustin (beginner)" <drupal.beginner@wechange.org>:
On Thursday 10 July 2008 16:13:48 Sean Burlington wrote:
I've never known CVS not to do that ...
but perhaps if you could tell us a little about your setup it might help us help you ..
Windows/Mac/Linux ?
Which version of cvs do you have?
Are you sure these files are neither in cvs - nor been cvsignore'd ??
Thanks Sean and Earnie for your follow ups.
I am using the latest version of Kubuntu (2008.4)
$ cvs -v Concurrent Versions System (CVS) 1.12.13 (client/server)
What about an aliased cvs command?
What is the output of ``alias cvs''?
And does ``cvs -f diff'' help? Earnie -- http://for-my-kids.com/ -- http://give-me-an-offer.com/
Quoting "augustin (beginner)" <drupal.beginner@wechange.org>:
On Thursday 10 July 2008 00:29:59 Jonathan Hedstrom wrote:
? 1234.patch ? 98734.patch ? TODO.txt
and then comes the diff output proper.
Those are simply files that the CVS repository doesn't know about. They shouldn't cause any problems with the patch, but you can always edit them out if you want.
I know that. I still would like to have them listed. It is useful to know which new files we have that we forgot to add (cvs add file) or which file we have that we don't intend to commit.
So, the question remains: how can I configure CVS so that those files are listed at the top of the patch, just like they are with Drupal CVS?
Your CVS is controlled by the files in CVSROOT which can be checked out and committed for changes; if you have appropriate karma to these files. Your working directory can also have a .cvsignore file that can cause these files to be ignored. Earnie -- http://for-my-kids.com/ -- http://give-me-an-offer.com/
participants (5)
-
augustin (beginner) -
Earnie Boyd -
Jonathan Hedstrom -
Sean Burlington -
Victor Kane