>>>> "Nevin" == Nevin Kapur
<nevin(a)jhu.edu> writes:
Hello Nevin,
please let me know what output you get now for
cvs -n -q update | grep "^[A-Z] "
I hope I fixed directory permissions at SunSITE.dk for rsync to work
now.
Best regards,
Adrian
Nevin> "Stephen J. Turnbull" <stephen(a)xemacs.org> writes:
>>
>>>> "Nevin" == Nevin
Kapur <nevin(a)jhu.edu> writes:
>
Nevin> One hitch. I am tracking the release-21-4 tag. When
Nevin> 21.4.5 came out, I used xemacs-21.4.4-21.4.5.patch.gz to
Nevin> patch my source tree. Now, when I did a cvs up, all the
Nevin> files have an M flag, for example:
>
Nevin> cvs server: Updating etc
Nevin> M etc/OXYMORONS
>
Nevin> Is that to be expected? (I realize this is
probably not an
Nevin> XEmacs question.)
>
>> Yes. You changed the source files without
changing the CVS metadata.
>> The patchkit intentionally omits the CVS directories. CVS will notice
>> this.
Nevin> OK. That clears that up.
> After the update, however, a cvs diff should show only true
local
> modifications. Also during the update you should get a lot of "XXX
> already contains YYYY changes" messages.
Nevin> I haven't made _any_ local changes. I use cvs to keep up with some
Nevin> tag. Currently that is release-21-4.
> If you show a lot of changes that you didn't make in the cvs
diff,
> please let me know. That should not happen, and may mean I've messed
> up the patch kit.
Nevin> Here's the diff for one of the files that's being shown as locally
Nevin> modified.
Nevin> [root@bombay xemacs-21.4]# cvs diff -u etc/OXYMORONS
Nevin> Index: etc/OXYMORONS
Nevin> ===================================================================
Nevin> RCS file: /pack/anoncvs/xemacs/etc/Attic/OXYMORONS,v
Nevin> retrieving revision 1.2
Nevin> diff -u -r1.2 OXYMORONS
Nevin> --- etc/OXYMORONS 2001/04/12 18:20:48 1.2
Nevin> +++ etc/OXYMORONS 2001/11/01 10:25:54
Nevin> @@ -37,6 +37,7 @@
Nevin> 21.4.14: Security Through Obscurity
Nevin> 21.4.15: Standard C
Nevin> 21.4.16: Successful IPO
Nevin> +21.4.17: Sufficiently Smart Compiler
Nevin> -N.B. Only incredibly redeeming suggestoins can be accepted now.
Nevin> +N.B. Only incredibly redeeming suggestions can be accepted now.
Nevin> --
Nevin> Nevin
--
Adrian Aichner
mailto:adrian@xemacs.org
http://www.xemacs.org/