[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[merge tracking] Report API vilations

From: Peter Lundblad <plundblad_at_google.com>
Date: 2007-01-24 17:40:48 CET


In my attempts to get started on the merge tracking branch, I noticed
a problem in the code that avoids merging subparts of a target tree
which has its own overlapping merge info.

Specifically, the loop of do_merge in libsvn_client/diff.c that calls
set_path of the reporter with the target revision. Per the reporter
API documentation, the calls to a reporter must be done in depth-first
order and as far as I remember, the reporter of libsvn_repos epends on
this API restriction.

So, this loop needs to be rewritten to take this into account.

Best regards,

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Jan 24 18:01:16 2007

This is an archived mail posted to the Subversion Dev mailing list.