LOL, I knew it had to be that simple. Unless I missed it I couldn't find
a 'patch' command reference in the online cvs manual. It mentioned it
when doing the diff, but that was it. So, I would make my changes, do a
diff -u, then do patch -p0 < path.filename, which creates a new file I
take it(?), then commit the new file. Is that about right?


-----Original Message-----
From: Peter Royal [mailto:proyal@;apache.org] 
Sent: Thursday, October 24, 2002 2:04 PM
To: Avalon Developers List
Subject: Re: [OT] CVS and patches

On Thursday, October 24, 2002, at 02:58  PM, Robert wrote:
> Forgive me for asking this off topic question, but I've looked around
> the net a bit and can't seem to find an answer. I know that when
> submitting a patch for some piece of code you like to have the patch
> submitted by doing a "diff -u"  command, correct?

You don't *have* to use "-u", it just makes the patch more 
human-readable.

> for example, I create a patch, do a diff on it and send it to the
list,
> how to you commiters actually apply it? I know how to commit a source
> file, but is that different than applying a patch?

the 'patch' command! 'diff' and 'patch' are two well-known command-line 
utilities. given a patch file, it is easy to apply via "patch -p0 < 
patch.filename'"

and then commit per usual.
-pete


--
To unsubscribe, e-mail:
<mailto:avalon-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail:
<mailto:avalon-dev-help@;jakarta.apache.org>



--
To unsubscribe, e-mail:   <mailto:avalon-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-dev-help@;jakarta.apache.org>

Reply via email to