How to make the diff file?

I've made an attempt at doing one of the easier documentation bits,
but I was wondering how I was supposed to make a diff. Is it enough to
diff the old file and new file, or do I need to cvs diff the whole
tree, or what?

--

-- 
Konrad Meyer

Re: How to make the diff file?

Konrad Meyer wrote:
> I've made an attempt at doing one of the easier documentation bits,
> but I was wondering how I was supposed to make a diff. Is it enough to
> diff the old file and new file, or do I need to cvs diff the whole
> tree, or what?

This page

http://ruby-doc.org/documentation-guidelines.html

should have the proper pointers on generating the diff.

You need only diff the file being modified, using

  cvs diff -pu1 <filename1> <filename2>

James Britt

Re: How to make the diff file?

Alright, thanks.
I do that, and get:

  cvs diff: No CVSROOT specified!  Please use the `-d' option
  cvs [diff aborted]: or set the CVSROOT environment variable.

Any ideas?

On 10/7/06, James Britt <jbritt <at> ruby-doc.org> wrote:
> Konrad Meyer wrote:
> > I've made an attempt at doing one of the easier documentation bits,
> > but I was wondering how I was supposed to make a diff. Is it enough to
> > diff the old file and new file, or do I need to cvs diff the whole
> > tree, or what?
>
> This page
>
> http://ruby-doc.org/documentation-guidelines.html
>
>
> should have the proper pointers on generating the diff.
>
> You need only diff the file being modified, using
>
>   cvs diff -pu1 <filename1> <filename2>
>
>
>
> James Britt
>

Re: How to make the diff file?

(Please don't top-post. Fixed top-posting.)

> On 10/7/06, James Britt <jbritt <at> ruby-doc.org> wrote:
> > Konrad Meyer wrote:
> > > I've made an attempt at doing one of the easier documentation bits,
> > > but I was wondering how I was supposed to make a diff. Is it enough to
> > > diff the old file and new file, or do I need to cvs diff the whole
> > > tree, or what?
> >
> > This page
> >
> > http://ruby-doc.org/documentation-guidelines.html
> >
> >
> > should have the proper pointers on generating the diff.
> >
> > You need only diff the file being modified, using
> >
> >   cvs diff -pu1 <filename1> <filename2>
> >

On 10/7/06, Konrad Meyer <konrad.meyer <at> gmail.com> wrote:
> Alright, thanks.
> I do that, and get:
>
>   cvs diff: No CVSROOT specified!  Please use the `-d' option
>   cvs [diff aborted]: or set the CVSROOT environment variable.
>
> Any ideas?
>

Re: How to make the diff file?

On 10/7/06, John Gabriele <jmg3000 <at> gmail.com> wrote:
> That is to say, you can make your diff using either the plain "diff"
> program, or else using the "cvs diff" command.

So the syntax is something like:
  diff -pu1 oldfile.rb newfile.rb
Am I correct? When I do this, I get a message saying "extra operand
`newfile.rb'".
--

-- 
Konrad Meyer

documentation for ParseDate

One module, one method. See attached.

I'd greatly appreciate comments, since this is my first effort; I
mostly tried to emulate the documentation of Ostruct, which was rated
at 10.

--

-- 
Conrad Meyer

documentation for Open3, Ping

If the formatting and whatnot of ParseDate is ok, I have patches for
Open3 and Ping (yes, I know they're simple) ready. See attached.

--

-- 
Konrad Meyer

Re: How to make the diff file?

On 10/7/06, Konrad Meyer <konrad.meyer <at> gmail.com> wrote:
> On 10/7/06, John Gabriele <jmg3000 <at> gmail.com> wrote:
> > That is to say, you can make your diff using either the plain "diff"
> > program, or else using the "cvs diff" command.
>
> So the syntax is something like:
>   diff -pu1 oldfile.rb newfile.rb
> Am I correct? When I do this, I get a message saying "extra operand
> `newfile.rb'".

Yes, looks correct. The command looks fine. Make sure you're not
putting a space anywhere in "-pu1".

---John

documentation for Shell

See attached; I tried to make sure there was at least a one line
explanation of all methods, but I might have made mistakes, done
something stupid, whatever. Comments *greatly* welcome. In some places
I fixed whitespace (for consistancy), but mostly left it alone. I
believe there were two methods like:

  def foo
     <at> foo
  end

that I changed to attr_reader :foo. That's all, please, feedback!

--

-- 
Konrad Meyer

Re: How to make the diff file?