Re: Re: [PATCH] 'svn merge' should not lose indirect merge information

On Tue, 11 Jul 2006 02:11:21 +0530, Daniel Rall <dlr@collab.net> wrote:

> On Fri, 07 Jul 2006, Madan S. wrote:
> ...
>> http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=117481

[snip]

> After spending some time looking at this, it finally became apparent
> that our previous incremental merges *may've changed the state* of the
> WC's merge info. This *why* was not immediately obvious -- it
> would've been very nice to have it described with the patch submission

Sorry Dan. I oversimplified the log, I see. I will make it a point to
describe my patches/proposals in detail (both what and why) from now on.

[snip]

> It would likely be more efficient if we could further conditionalize
> re-parsing of the merge info based on whether any properties were
> updated by the merge, or -- even better -- if the SVN_PROP_MERGE_INFO
> property was updated. This might be able to be handled in conjunction
> with the notification callback fixes.

Will follow up on this.

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:39:11 2006