DragonFly BSD
DragonFly users List (threaded) for 2005-03
[Date Prev][Date Next]  [Thread Prev][Thread Next]  [Date Index][Thread Index]

Creating a patch

From: Jasse Jansson <jasse@xxxxxxxxx>
Date: Fri, 25 Mar 2005 00:04:50 +0100

I found an article about how to create a patch at the wiki.
The article told me to make a copy the file I was working on.
Well I have to admit that it makes sense, so I did.
In my case, the copy got the name fdisk.c.local as per
the wiki recommendation. So far so good.
I made my changes, issued 'cd ..' 3 times to get a
reference point for cvs (or something else, I just have
a faint memory of reading about the 'cd ..' stuff somewhere)
Entering the command:

diff -u sbin/i386/fdisk/fdisk.c sbin/i386/fdisk/fdisk.c.local >

(Where is the #^*@&€ backslash on my iBook keyboard)

This works fine, but the first two lines looks like this

--- sbin/i386/fdisk/fdisk.c	2004-12-18 22:43:38.000000000 +0100
+++ sbin/i386/fdisk/fdisk.c.local	2005-03-25 00:10:45.000000000 +0100

It looks like to me that fdisk.c should be replaced with fdisk.c.local.

The patches posted in the submit list don't have the .local extension.

Where did I go wrong?

I have the whole DFly cvs repository on the disk, but edited
a file in my checked out sources, and diffed checked out
sources against other checked out source.

Should I have diffed the checked out source with my changes
against the repository?

If this is the case, how do I make a reference to the repository
that diff understands?
The manpage don't even mention this case.


[Date Prev][Date Next]  [Thread Prev][Thread Next]  [Date Index][Thread Index]