[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Feature request: keep CVS/Entries in sorted order
From: |
Mark D. Baushke |
Subject: |
Re: Feature request: keep CVS/Entries in sorted order |
Date: |
Thu, 07 Aug 2003 16:11:26 -0700 |
Ed Avis <ed@membled.com> writes:
> In the working copy there is a CVS/Entries file in each directory. As
> far as I can tell the order of the lines in this file does not matter,
> and CVS currently appends new lines to the end of the file.
>
> When diffing one working copy against another (simply with 'diff -r',
> as you might do when resolving import conflicts, for
> example) spurious differences in the Entries file can show up simply
> because the ordering of lines differs. This makes it harder to spot
> real differences in these files.
>
> CVS could sort Entries into ASCIIbetical order before writing
> it. This would make sure that two Entries files with the same meaning
> have the same representation, so diffing would be easier.
The timestamps will also differ. Use GNU diffutils and then use a
command like:
diff -x CVS -r -u -p original-directory new-directory
to get the output you want that ignores all of the CVS directories.
-- Mark