Check-in [589687d783]
Not logged in
Overview

SHA1 Hash:589687d783c2e74de42b9969731d7342008ab348
Date: 2008-08-14 16:15:17
User: cle
Comment:Fix bug c858c4178b - at three places, the original checkin comment was taken from the repository. Only if there was no original checkin comment, the edited comment (ecomment) was fetched.

That logic seem wrong. As at all other cases, first the ecommend was fetched and only when that failed, the original comment was taken, I corrected the three places in code accordingly.

Timelines: ancestors | descendants | both | trunk
Other Links: files | ZIP archive | manifest

Tags And Properties
Changes
[hide diffs]

Modified src/info.c from [20f6da86e6] to [e23983e04c].

@@ -116,11 +116,11 @@
   Stmt q;
   int cnt = 0;
   db_prepare(&q,
     "SELECT plink.cid, blob.uuid, datetime(plink.mtime, 'localtime'),"
     "       coalesce(event.euser,event.user),"
-    "       coalesce(event.comment,event.ecomment)"
+    "       coalesce(event.ecomment,event.comment)"
     "  FROM plink, blob, event"
     " WHERE plink.pid=%d"
     "   AND blob.rid=plink.cid"
     "   AND event.objid=plink.cid"
     " ORDER BY plink.mtime ASC",
@@ -168,11 +168,11 @@
   Stmt q;
   int cnt = 0;
   db_prepare(&q,
     "SELECT plink.pid, blob.uuid, datetime(event.mtime, 'localtime'),"
     "       coalesce(event.euser,event.user),"
-    "       coalesce(event.comment,event.ecomment)"
+    "       coalesce(event.ecomment,event.comment)"
     "  FROM plink, blob, event"
     " WHERE plink.cid=%d"
     "   AND blob.rid=plink.pid"
     "   AND event.objid=plink.pid"
     " ORDER BY event.mtime DESC",
@@ -659,11 +659,11 @@
   Stmt q;
   int cnt = 0;
   int nWiki = 0;
   db_prepare(&q,
     "SELECT filename.name, datetime(event.mtime), substr(a.uuid,1,10),"
-    "       coalesce(event.comment,event.ecomment),"
+    "       coalesce(event.ecomment,event.comment),"
     "       coalesce(event.euser,event.user),"
     "       b.uuid"
     "  FROM mlink, filename, event, blob a, blob b"
     " WHERE filename.fnid=mlink.fnid"
     "   AND event.objid=mlink.mid"