lintian: r275 - in trunk: checks debian testset
Author: jeroen
Date: 2004-05-18 00:04:56 +0200 (Tue, 18 May 2004)
New Revision: 275
Modified:
trunk/checks/cruft
trunk/checks/cruft.desc
trunk/debian/changelog
trunk/testset/tags.filenames
Log:
checks/cruft{,.desc}:
+ [JvW] Also check for source-contains-svn-conflict-copy (for .r123 and
.mine files)
Modified: trunk/checks/cruft
===================================================================
--- trunk/checks/cruft 2004-05-17 21:55:00 UTC (rev 274)
+++ trunk/checks/cruft 2004-05-17 22:04:56 UTC (rev 275)
@@ -88,6 +88,8 @@
tag "cvsignore-file-in-source", "$name";
} elsif ($name =~ m,^(.+/)?\.\#(.+?)\.\d+(\.\d+)*$,) {
tag "source-contains-cvs-conflict-copy", "$name";
+ } elsif ($name =~ m,^(.+/)?(.+?)\.(r\d+|mine)$,) {
+ tag "source-contains-svn-conflict-copy", "$name";
}
if ($name =~ m,^(.+/)?config.(?:cache|log|status)$, and $pkg ne "lintian") {
Modified: trunk/checks/cruft.desc
===================================================================
--- trunk/checks/cruft.desc 2004-05-17 21:55:00 UTC (rev 274)
+++ trunk/checks/cruft.desc 2004-05-17 22:04:56 UTC (rev 275)
@@ -75,3 +75,11 @@
from the source repository. The file name is `.#file.version', where
file is the original filename and version the revision your modifications
were based on.
+
+Tag: source-contains-svn-conflict-copy
+Type: warning
+Info: Package contains a Subversion conflict copy. These are generated by
+ Subversion when a conflict was detected while merging local changes with the
+ updates from the source repository. Use <tt>svn resolved</tt> to indicate you
+ resolved the conflict, after you have manually checked and worked out the
+ conflict.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-05-17 21:55:00 UTC (rev 274)
+++ trunk/debian/changelog 2004-05-17 22:04:56 UTC (rev 275)
@@ -25,6 +25,8 @@
+ [HE] New check: source-contains-cvs-conflict-copy, triggered by
.#file.version files. They are created by cvs when it tries to merge
local changes and an update from the repo. (Closes: #246060)
+ + [JvW] Also check for source-contains-svn-conflict-copy (for .r123 and
+ .mine files)
* checks/debhelper:
+ [FL] Avoid Perl warning about undefined values. Noted by JvW.
* checks/fields{,.desc}:
@@ -70,7 +72,7 @@
+ [JvW] Fix two lintian warnings in lintian itself by touching files only
on clean target, and not distributing them in the source
- -- Debian Lintian Maintainers <lintian-maint@debian.org> Wed, 12 May 2004 01:26:07 +0200
+ -- Debian Lintian Maintainers <lintian-maint@debian.org> Tue, 18 May 2004 00:03:28 +0200
lintian (1.23.0) unstable; urgency=low
Modified: trunk/testset/tags.filenames
===================================================================
--- trunk/testset/tags.filenames 2004-05-17 21:55:00 UTC (rev 274)
+++ trunk/testset/tags.filenames 2004-05-17 22:04:56 UTC (rev 275)
@@ -26,6 +26,8 @@
W: filenames source: ancient-standards-version 3.1.1
W: filenames source: source-contains-CVS-dir CVS
W: filenames source: source-contains-cvs-conflict-copy files/.#Maelstrom Sound.1.1.1
+W: filenames source: source-contains-svn-conflict-copy files/Maelstrom Sounce.r121
+W: filenames source: source-contains-svn-conflict-copy files/Maelstrom Sound.mine
W: filenames source: source-contains-svn-control-dir .svn
W: filenames source: svn-commit-file-in-source files/svn-commit.tmp
W: filenames: bad-permissions-for-ali-file usr/lib/ada/adalib/test.ali
@@ -33,8 +35,11 @@
W: filenames: file-in-unusual-dir files/ .tif
W: filenames: file-in-unusual-dir files/".tif
W: filenames: file-in-unusual-dir files/'\\
+W: filenames: file-in-unusual-dir files/.#Maelstrom Sound.1.1.1
W: filenames: file-in-unusual-dir files/.cvsignore
+W: filenames: file-in-unusual-dir files/Maelstrom Sounce.r121
W: filenames: file-in-unusual-dir files/Maelstrom Sound
+W: filenames: file-in-unusual-dir files/Maelstrom Sound.mine
W: filenames: file-in-unusual-dir files/svn-commit.tmp
W: filenames: no-priority-field
W: filenames: no-section-field
Reply to: