[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[PATCH][merge-tracking] parse_mergeinfo_from_db sqlite query fix

From: Kamesh Jayachandran <kamesh_at_collab.net>
Date: 2006-08-17 11:24:55 CEST

Hi All,
Find the attached patch.

With regards
Kamesh Jayachandran

Patch by: Kamesh Jayachandran <kamesh@collab.net>

'group by' to 'order by'.
* subversion/libsvn_fs_fs/tree.c
   The sql query to retrieve the merge rev ranges for a 'mergeto' should be
   having a 'order by mergefrom' clause not the 'group by mergefrom' clause.

Index: subversion/libsvn_fs_fs/tree.c
--- subversion/libsvn_fs_fs/tree.c (revision 20955)
+++ subversion/libsvn_fs_fs/tree.c (working copy)
@@ -1123,7 +1123,7 @@
                              "SELECT mergedfrom, mergedrevstart,"
                              "mergedrevend from mergeinfo "
                              "where mergedto = ? and revision = ? "
- "group by mergedfrom;",
+ "order by mergedfrom;",
                              -1, &stmt, NULL), db);
   SQLITE_ERR(sqlite3_bind_text(stmt, 1, path, -1, SQLITE_TRANSIENT), db);
   SQLITE_ERR(sqlite3_bind_int64(stmt, 2, lastchanged_rev), db);

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Aug 17 11:25:56 2006

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.