From: Michael Schmitt <michael.schmitt@teststep.org>
Date: Mon, 8 Jan 2007 23:28:41 +0000 (+0000)
Subject: * src/changes.C: two changes of type UNCHANGED are always equals
X-Git-Tag: 1.6.10~11246
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=2fc6d44b946b3e95aefd4c0706be31a9083b4c54;p=lyx.git

* src/changes.C: two changes of type UNCHANGED are always equals

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16619 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/changes.C b/src/changes.C
index 989d69bcb1..511e429ede 100644
--- a/src/changes.C
+++ b/src/changes.C
@@ -53,8 +53,16 @@ bool Change::isSimilarTo(Change const & change)
 
 bool operator==(Change const & l, Change const & r)
 {
-	return l.type == r.type &&
-	       l.author == r.author &&
+	if (l.type != r.type) {
+		return false;
+	}
+
+	// two changes of type UNCHANGED are always equal
+	if (l.type == Change::UNCHANGED) {
+		return true;
+	}
+	
+	return l.author == r.author &&
 	       l.changetime == r.changetime;
 }