Dan,
Need not be, I could not see any case which would trigger this in
current state of '/trunk' and in the past releases.
With regards
Kamesh Jayachandran
Daniel L. Rall wrote:
> Shouldn't this bug fix be backported?
>
> On Tue, 25 Sep 2007, kameshj@tigris.org wrote:
>
>
>> Author: kameshj
>> Date: Tue Sep 25 09:31:32 2007
>> New Revision: 26782
>>
>> Log:
>> Fix bug:
>> Currently our diff editor's open_file hook does not respect per file
>> base revision given by the reporter. This is a bug. We never surfaced this
>> problem as we never specialize any of the sub paths in our diff with
>> different start revisions(base revisions) via 'set_path' calls on a reporter.
>>
>> In new way of merging via 2821 we hit this bug. As this change itself
>> independent of any style, making a independent commit.
>>
>> * subversion/libsvn_client/repos_diff.c
>> (get_file_from_ra): Accept revision number from the caller rather than
>> assuming it to be 'b->edit_baton->revision'.
>> (delete_entry): Call 'get_file_from_ra' with 'eb->revision' as at
>> base_revision file itself would have been deleted.
>> (open_file): Call 'get_file_from_ra' with 'base_revision'.
>>
>>
>> Modified:
>> trunk/subversion/libsvn_client/repos_diff.c
>>
>> Modified: trunk/subversion/libsvn_client/repos_diff.c
>> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_client/repos_diff.c?pathrev=26782&r1=26781&r2=26782
>> ==============================================================================
>> --- trunk/subversion/libsvn_client/repos_diff.c (original)
>> +++ trunk/subversion/libsvn_client/repos_diff.c Tue Sep 25 09:31:32 2007
>> @@ -250,7 +250,7 @@
>> * delete this file.
>> */
>> static svn_error_t *
>> -get_file_from_ra(struct file_baton *b)
>> +get_file_from_ra(struct file_baton *b, svn_revnum_t revision)
>> {
>> apr_file_t *file;
>> svn_stream_t *fstream;
>> @@ -265,7 +265,7 @@
>> fstream = svn_stream_from_aprfile(file, b->pool);
>> SVN_ERR(svn_ra_get_file(b->edit_baton->ra_session,
>> b->path,
>> - b->edit_baton->revision,
>> + revision,
>> fstream, NULL,
>> &(b->pristine_props),
>> b->pool));
>> @@ -450,7 +450,7 @@
>>
>> /* Compare a file being deleted against an empty file */
>> b = make_file_baton(path, FALSE, eb, pool);
>> - SVN_ERR(get_file_from_ra(b));
>> + SVN_ERR(get_file_from_ra(b, eb->revision));
>> SVN_ERR(get_empty_file(b->edit_baton, &(b->path_end_revision)));
>>
>> get_file_mime_types(&mimetype1, &mimetype2, b);
>> @@ -610,7 +610,7 @@
>> b = make_file_baton(path, FALSE, pb->edit_baton, pool);
>> *file_baton = b;
>>
>> - SVN_ERR(get_file_from_ra(b));
>> + SVN_ERR(get_file_from_ra(b, base_revision));
>>
>> return SVN_NO_ERROR;
>> }
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: svn-unsubscribe@subversion.tigris.org
>> For additional commands, e-mail: svn-help@subversion.tigris.org
>>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Sep 27 09:01:37 2007