You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2012/05/21 17:39:49 UTC
svn commit: r1341078 - in /subversion/branches/1.7.x-r1341012: ./
subversion/libsvn_wc/status.c
Author: stsp
Date: Mon May 21 15:39:48 2012
New Revision: 1341078
URL: http://svn.apache.org/viewvc?rev=1341078&view=rev
Log:
On the 1.7.x-r1341012 branch, merge r1341076 from trunk (clean merge).
Modified:
subversion/branches/1.7.x-r1341012/ (props changed)
subversion/branches/1.7.x-r1341012/subversion/libsvn_wc/status.c
Propchange: subversion/branches/1.7.x-r1341012/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1341076
Modified: subversion/branches/1.7.x-r1341012/subversion/libsvn_wc/status.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1341012/subversion/libsvn_wc/status.c?rev=1341078&r1=1341077&r2=1341078&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1341012/subversion/libsvn_wc/status.c (original)
+++ subversion/branches/1.7.x-r1341012/subversion/libsvn_wc/status.c Mon May 21 15:39:48 2012
@@ -1128,7 +1128,7 @@ get_dir_status(const struct walk_status_
/* Walk all the children of this directory. */
sorted_children = svn_sort__hash(all_children,
- svn_sort_compare_items_as_paths,
+ svn_sort_compare_items_lexically,
subpool);
for (i = 0; i < sorted_children->nelts; i++)
{