mo...@apache.org wrote on Sun, Jun 26, 2011 at 07:49:37 -0000: > Author: moklo > Date: Sun Jun 26 07:49:36 2011 > New Revision: 1139725 > > URL: http://svn.apache.org/viewvc?rev=1139725&view=rev > Log: > Whitespace adjustments > > * subversion/libsvn_diff/diff3.c > Made first half of file match second half and norm >
Good to see that your commit access works. You may want to add yourself to COMMITTERS at this point, to the "Experimental branches" section, and create a branch in the repository to do your work on. As a reminder, at this time your commit access is limited to a branch (or branches), and you should not be committing non-trivial patches to trunk without a full committer's +1. HACKING has the details: http://subversion.apache.org/docs/community-guide/roles (in particular the "Partial commit access", "Lightweight branches", and "Obvious fix" sections). Thanks, -- Daniel, speaking for #svn-dev > Modified: > subversion/trunk/subversion/libsvn_diff/diff3.c > > Modified: subversion/trunk/subversion/libsvn_diff/diff3.c > URL: > http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_diff/diff3.c?rev=1139725&r1=1139724&r2=1139725&view=diff > ============================================================================== > --- subversion/trunk/subversion/libsvn_diff/diff3.c (original) > +++ subversion/trunk/subversion/libsvn_diff/diff3.c Sun Jun 26 07:49:36 2011 > @@ -41,208 +41,208 @@ svn_diff__resolve_conflict(svn_diff_t *h > svn_diff__token_index_t num_tokens, > apr_pool_t *pool) > { > - apr_off_t modified_start = hunk->modified_start + 1; > - apr_off_t latest_start = hunk->latest_start + 1; > - apr_off_t common_length;
