From a66698f947e8ded2e020defa626b154aca1fde9f Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Fri, 6 Nov 2009 22:40:23 +0100
Subject: handle messages with ids (more) correctly

when comparing two messages which both have ids, compare only the ids.
this affects finding/reporting duplicates and merging.
---
 .../testdata/good/mergecpp_noobsolete/project.ts.before     | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/project.ts.before')

diff --git a/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/project.ts.before b/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/project.ts.before
index 834f5121eb..feab1694d9 100644
--- a/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/project.ts.before
+++ b/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/project.ts.before
@@ -1,5 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS><TS version="1.1">
+<context>
+    <name></name>
+    <message id="keep_id">
+        <location filename="finddialog.cpp" line="153"/>
+        <source>This is some random text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message id="obsolete_id">
+        <location filename="finddialog.cpp" line="155"/>
+        <source>Should be obsolete, too</source>
+        <translation type="unfinished">SHOULD BE OBSOLETE AS WELL</translation>
+    </message>
+</context>
 <context>
     <name>FindDialog</name>
     <message>
-- 
cgit v1.2.3