kameshj_at_tigris.org writes:
> Author: kameshj
> Revision: 31927
> Property Name: svn:log
> Action: modified
>
> Property diff:
> --- old property value
> +++ new property value
> @@ -2,8 +2,13 @@ Fix issue-3067 desc36.
>
> * subversion/libsvn_client/merge.c
> (prepare_subtree_ranges): 'svn_client__repos_location_segments'
> - gives location segments order oldest to youngest.
> - Here the code wants the youngest segment which is available at the
> - end of the segment list.
> + gives location segments ordered from oldest to youngest.
> + Here the code wants the youngest segment to compare with
> + its parent's remaining_ranges which is available at the
> + end of the segments list. So take the last segment.
> + As we are reading the last segment first(youngest), it can not be added
> + to 'different_name_rangelist' as it needs ranges in ascending order,
> + so read the segments from begining to end.
> +
Mmmm, I think most of this belongs as comments in the code itself. The
log message can just say something like this:
Fix issue-3067 desc36: an edge case when the "corresponding subtree
source" has broken history.
* subversion/libsvn_client/merge.c
(prepare_subtree_ranges): Grab the youngest segment, not the oldest,
and don't push it on to different_name_rangelist, which needs
ranges in ascending order.
* subversion/tests/cmdline/merge_tests.py
(test_list): Remove XFail marker from subtrees_with_empty_mergeinfo.
The main point is that the details and motivations should be comments in
the code.
-Karl
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-07-02 23:00:54 CEST