On Tue, 11 Jul 2006 02:11:06 +0530, <dlr@tigris.org> wrote:
> Author: dlr
> Date: Mon Jul 10 13:41:05 2006
> New Revision: 20515
>
> Modified:
> branches/merge-tracking/subversion/libsvn_client/diff.c
>
> Log:
> On the merge-tracking branch: Avoid discarding any additional merge
> info which entered the WC as the result of a property merge.
>
> * subversion/libsvn_client/diff.c
> (do_merge, do_single_file_merge): Re-parse the merge info reflected
> by the WC before using it to update its merge info based on the
> revision ranges which were just merged in.
Thank you for applying the patch. I would like to point out one thing
though. Even though we have this change in the do_single_file_merge()
function, the fix alone would not have fixed anything wrt single file
merges. This is because of the missing API I described in
http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=117585.
Let me explain in detail. On merge of a single file, neither the
current source nor the current target have all the merge info pertaining
to the file. This info is stored in one of its parents or grandparents due
to eliding(This also applies to directories with merge info elided in
parent directories). Because of this, our single file merges simply assume
that the source has no relevant mergeinfo and proceeds to only record the
current merge in the target.
We need to introduce this special case of elided merge of the
svn:mergeinfo property before this change can show its effect on
single-file merges.
Just pointing out, in case this isn't immediately obvious.
Regards,
Madan.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Jul 11 09:35:20 2006