From 75808db17caf8b960b351e3408e74142f4c85aac Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 14 Apr 2024 15:42:30 +0200 Subject: Adding upstream version 2.117.0. Signed-off-by: Daniel Baumann --- tags/d/debian-adds-svn-conflict-file.tag | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 tags/d/debian-adds-svn-conflict-file.tag (limited to 'tags/d/debian-adds-svn-conflict-file.tag') diff --git a/tags/d/debian-adds-svn-conflict-file.tag b/tags/d/debian-adds-svn-conflict-file.tag new file mode 100644 index 0000000..fc170c2 --- /dev/null +++ b/tags/d/debian-adds-svn-conflict-file.tag @@ -0,0 +1,10 @@ +Tag: debian-adds-svn-conflict-file +Severity: warning +Check: files/artifact +Renamed-From: + diff-contains-svn-conflict-file +Explanation: The Debian diff or native package contains a file that looks like a + Subversion conflict file. These are generated by Subversion when a + conflict was detected while merging local changes with updates from a + source repository. Use svn resolved to remove them and clear + the Subversion conflict state after you have resolved the conflict. -- cgit v1.2.3