Re: svn commit: propchange - r31927 - svn:log

[Karl Fogel <kf...@red-bean.com>]

kameshj@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@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: svn commit: propchange - r31927 - svn:log

[Kamesh Jayachandran <ka...@collab.net>]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

> Mmmm, I think most of this belongs as comments in the code itself.  The
> log message can just say something like this:
>

Documented in r31988.

>    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.
>

Tweaked as above.

Thanks
With regards
Kamesh Jayachandran
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFIbPNm3WHvyO0YTCwRAvIQAJ9l/2iAxD5AxzRpsoWorGuXXMIgoACZAdOi
lhWcRF263k0pc3dVZQQtgXY=
=xqSn
-----END PGP SIGNATURE-----

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org