]> git.lyx.org Git - lyx.git/commitdiff
* src/changes.C: two changes of type UNCHANGED are always equals
authorMichael Schmitt <michael.schmitt@teststep.org>
Mon, 8 Jan 2007 23:28:41 +0000 (23:28 +0000)
committerMichael Schmitt <michael.schmitt@teststep.org>
Mon, 8 Jan 2007 23:28:41 +0000 (23:28 +0000)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16619 a592a061-630c-0410-9148-cb99ea01b6c8

src/changes.C

index 989d69bcb10bebc8acb6f09517e599fac8abd394..511e429ede717258b03927e40e0335fc533a34c5 100644 (file)
@@ -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;
 }