You are viewing a plain text version of this content. The canonical link for it is here.

Posted to dev@subversion.apache.org by Daniel Rall <dl...@collab.net> on 2007/09/28 16:31:18 UTC

Re: svn commit: r26822 - trunk/subversion/libsvn_client

On Fri, 28 Sep 2007, kameshj@tigris.org wrote:
...
> --- trunk/subversion/libsvn_client/merge.c	(original)
> +++ trunk/subversion/libsvn_client/merge.c	Fri Sep 28 00:02:45 2007
> @@ -1577,7 +1577,8 @@
>  }
>  
>  /* Sets up the diff editor report and drives it by properly negating
> -   subtree that could have a conflicting merge history.*/
> +   subtree that could have a conflicting merge history.
> +   If non-null CHILDREN_WITH_MERGEINFO is given, it should not be empty.*/

I dislike this restriction.  It'd be cleaner to check for an empty
array internally.

RE: svn commit: r26822 - trunk/subversion/libsvn_client

Posted by Kamesh Jayachandran <ka...@collab.net>.

>>  /* Sets up the diff editor report and drives it by properly negating
>> -   subtree that could have a conflicting merge history.*/
>> +   subtree that could have a conflicting merge history.
>> +   If non-null CHILDREN_WITH_MERGEINFO is given, it should not be empty.*/

>I dislike this restriction.  It'd be cleaner to check for an empty
>array internally.

Dan Fixed in r26838.

Thanks for the review.

With regards
Kamesh Jayachandran