[pkg-horde] [COMMIT lionel nag--upstream--1--patch-2] Make .rej files unrecognised

Lionel Elie Mamane lmamane at costa.debian.org
Sat Dec 24 19:20:03 UTC 2005


A  {arch}/nag/nag--upstream/nag--upstream--1/pkg-horde-hackers at lists.alioth.debian.org--2006/patch-log/patch-2
M  {arch}/=tagging-method

--- /dev/null
+++ {arch}/nag/nag--upstream/nag--upstream--1/pkg-horde-hackers at lists.alioth.debian.org--2006/patch-log/patch-2
@@ -0,0 +1,13 @@
+Revision: nag--upstream--1--patch-2
+Archive: pkg-horde-hackers at lists.alioth.debian.org--2006
+Creator: Lionel Elie Mamane <lionel at mamane.lu>
+Date: Sat Dec 24 20:19:11 CET 2005
+Standard-date: 2005-12-24 19:19:11 GMT
+Modified-files: {arch}/=tagging-method
+New-patches: pkg-horde-hackers at lists.alioth.debian.org--2006/nag--upstream--1--patch-2
+Summary: Make .rej files unrecognised
+Keywords: 
+
+This makes tla complain if any .rej file is left. Probably unresolved
+conflicts.
+


--- orig/{arch}/=tagging-method
+++ mod/{arch}/=tagging-method
@@ -147,18 +147,19 @@
 # traversal does not descend into backup directories:
 #
 
-backup ^.*(~|\.~[0-9]+~|\.bak|\.swp|\.orig|\.rej|\.original|\.modified|\.reject)$
+backup ^.*(~|\.~[0-9]+~|\.bak|\.swp|\.orig|\.original|\.modified|\.reject)$
 
 # If you want to force certain filenames to be treated as errors when present,
 # you can add them to the regexp for deliberately unrecognized files.  Traversal
 # does not descend into unrecognized directories.
 
-unrecognized ^(.*\.(o|a|so|core|so(\.[[:digit:]]+)*)|core)$
+unrecognized ^(.*\.(rej|o|a|so|core|so(\.[[:digit:]]+)*)|core)$
 
 # Files which match the following pattern are treated as source files.
 # Traversal _does_ descend into source directories:
 
 source ^[_=a-zA-Z0-9].*$
+source ^\.htaccess$
 
 # Any files not classified by the above rules are classified as unrecognized.
 # Traversal does not descend into unrecognized directories.




More information about the pkg-horde-hackers mailing list