Complete.Org: Mailing Lists: Archives: freeciv-dev: April 2000:
[Freeciv-Dev] Re: patch: add diff exclude file to cvs/dist (PR#343)

[Freeciv-Dev] Re: patch: add diff exclude file to cvs/dist (PR#343)

[Top] [All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
To: freeciv-dev@xxxxxxxxxxx, bugs@xxxxxxxxxxxxxxxxxxx
Subject: [Freeciv-Dev] Re: patch: add diff exclude file to cvs/dist (PR#343)
From: David Pfitzner <dwp@xxxxxxxxxxxxxx>
Date: Mon, 1 May 2000 00:16:00 +1000 (EST)

Some minor changes:
- added '#*#', as suggested by Thue (for Emacs auto-save files);
- adjusted freeciv_hackers_guide.txt, as suggested by jjm;
- changed filename from 'exclude' to 'diff_ignore' -- somewhat clearer?

-- David
diff -u -r --exclude-from exclude_auto -N freeciv-cvs/ 
--- freeciv-cvs/     Thu Dec 23 16:48:23 1999
+++ fc-adv/  Mon May  1 00:05:26 2000
@@ -23,4 +23,4 @@
 EXTRA_DIST=    PEOPLE BUGS HOWTOPLAY freeciv_hackers_guide.txt \
                README.AI README.rulesets \
-               civ ser config.mac.h
+               civ ser config.mac.h diff_ignore
diff -u -r --exclude-from exclude_auto -N freeciv-cvs/diff_ignore 
--- freeciv-cvs/diff_ignore     Thu Jan  1 10:00:00 1970
+++ fc-adv/diff_ignore  Mon May  1 00:07:06 2000
@@ -0,0 +1,40 @@
diff -u -r --exclude-from exclude_auto -N freeciv-cvs/freeciv_hackers_guide.txt 
--- freeciv-cvs/freeciv_hackers_guide.txt       Sun Apr  9 14:03:13 2000
+++ fc-adv/freeciv_hackers_guide.txt    Mon May  1 00:08:23 2000
@@ -504,44 +504,8 @@
 - When doing a "diff" for a patch, be sure to exclude unnecessary files
   by using the "-X" argument to "diff".  E.g.:
-    % diff -ruN -Xno.freeciv freeciv_cvs freeciv >/tmp/fix-foo-bug-0.diff
+    % diff -ruN -Xdiff_ignore freeciv_cvs freeciv >/tmp/fix-foo-bug-0.diff
-  Here is a useful no.freeciv file:
+  A suggested "diff_ignore" file is included in the Freeciv distribution.

[Prev in Thread] Current Thread [Next in Thread]