[pkg-horde] [COMMIT lionel mnemo--upstream--1--patch-1] make *.rej files unrecognised

Lionel Elie Mamane lmamane at costa.debian.org
Wed Dec 21 20:45:02 UTC 2005


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

--- /dev/null
+++ {arch}/mnemo/mnemo--upstream/mnemo--upstream--1/pkg-horde-hackers at lists.alioth.debian.org--2006/patch-log/patch-1
@@ -0,0 +1,12 @@
+Revision: mnemo--upstream--1--patch-1
+Archive: pkg-horde-hackers at lists.alioth.debian.org--2006
+Creator: Lionel Elie Mamane <lionel at mamane.lu>
+Date: Wed Dec 21 21:40:39 CET 2005
+Standard-date: 2005-12-21 20:40:39 GMT
+Modified-files: {arch}/=tagging-method
+New-patches: pkg-horde-hackers at lists.alioth.debian.org--2006/mnemo--upstream--1--patch-1
+Summary: make *.rej files unrecognised
+Keywords: 
+
+This instructs tla to loudly complain if a .rej file is present. It
+probably means that there is an unhandled conflict left.


--- orig/{arch}/=tagging-method
+++ mod/{arch}/=tagging-method
@@ -147,13 +147,13 @@
 # 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:




More information about the pkg-horde-hackers mailing list