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

Re: [MiNT] FEC Ethernet driver patch for Coldfires

2015-02-15 20:57 GMT+01:00 Vincent Rivière <vincent.riviere@freesbee.fr>:
> On 15/02/2015 10:32, Markus Fröschle wrote:
>> please find attached a patch to the Coldfire FEC ethernet driver. While
>> the
>> Firebee functionality is untouched, it adds a machine detection (evaluate
>> MCH_ cookie)
> Excellent!
> A few remarks:
> 1) Please provide patches in unified diff format (diff -u).
> 2) Please provide minimal patches. Mainly, do not provide changes where you
> only replaced tabs by spaces.

I've seen also that two new files were attached aside the patch, just
in case it's useful for you here is a way to include new files in a
CVS diff. (it's from Mozilla old documentation):

Including new files in a patch

To include a new file in your patch, use the -N option:

$ cvs diff -u8pN mozilla/<restOfPath>/ > OUT_FILE

A common problem here is that cvs diff will not include the new files
that were not cvs added, and cvs add requires write access to

The solution is to use the cvsdo utility, which edits CVS/Entries to
make cvs think the file is added to repository:

$ cvsdo add NEWFILE
$ cvs diff -u8pN NEWFILE > OUT_FILE

Creating a patch that contains files in new directories is a bit
trickier. First, create a diff of everything NOT in a new directory:

$ cvsdo add newfiles
$ cvs diff -u8pN NEWFILES > OUT_FILE

Now, you will have to cvsdo add, each new directory, and then the
files in that directory.

$ cvsdo add mozilla/<restOfPath>/newdir/
$ cvsdo add mozilla/<restOfPath>/newdir/newfile

Then you can cvsdo diff on each new directory, appending the changes
to your diff.

$ cvsdo diff mozilla/<restOfPath>/newdir/ >> OUT_FILE