subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1736309 - /subversion/trunk/subversion/libsvn_client/conflicts.c
Date Wed, 23 Mar 2016 11:46:20 GMT
Author: stsp
Date: Wed Mar 23 11:46:20 2016
New Revision: 1736309

URL: http://svn.apache.org/viewvc?rev=1736309&view=rev
Log:
In tree conflict descriptions, display revisions containing incoming edits
in ascending order, rather than in descending order.

* subversion/svn/conflict-callbacks.c
  (conflict_tree_get_details_incoming_edit): Swap the start/end revisions for
   svn_ra_get_log2() so revisions arrive in ascending order.

Modified:
    subversion/trunk/subversion/libsvn_client/conflicts.c

Modified: subversion/trunk/subversion/libsvn_client/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/conflicts.c?rev=1736309&r1=1736308&r2=1736309&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Wed Mar 23 11:46:20 2016
@@ -2695,8 +2695,8 @@ conflict_tree_get_details_incoming_edit(
                                                scratch_pool,
                                                scratch_pool));
   SVN_ERR(svn_ra_get_log2(ra_session, paths,
-                          old_rev < new_rev ? new_rev : old_rev,
                           old_rev < new_rev ? old_rev : new_rev,
+                          old_rev < new_rev ? new_rev : old_rev,
                           0, /* no limit */
                           TRUE, /* need the changed paths list */
                           FALSE, /* need to traverse copies */



Mime
View raw message