This is the mail archive of the
mailing list for the Cygwin project.
Re: [PATCH]: mknetrel builds Guile #2: debug
Jan Nieuwenhuizen wrote:
> Earnie Boyd <email@example.com> writes:
> >> Btw: A very silly question, but I can't seem to get `cvs diff' to
> >> respect your (Cygwin's?) wishes of excluding the ChangeLog from
> >> the diff. It doesn't grok -X,--exclude options, most annoying.
> >> How do you manage?
> > Remove the ChangeLog diff from the patch. Copy the text from the
> > ChangeLog to the top of the diff file. Patch is smart enough to ignore
> > the non-diff text in the front of the file.
> Hrmm. If you're going to have nonstandard requests, it would be handy
> if these somehow would be handled automagically. How dead is CVS
> development, maybe they would take a patch?
This has nothing to do with CVS. It has to do with standards set by the
development teams and the fact that your changes to ChangeLog often
(most likely) cause merge conflicts.