Well, right before I thought I finished making svn_wc_merge2 loggy, I
found out libsvn_wc has big problems with running the log file
svn_wc_merge2 generates when called from a log file.
When writing a log file to make a function loggy, there is no way to
know which logfiles already exist as created by other functions. In
the case from svn_wc_merge2, this means we overwrite log file 0
Then, not knowing we're called from a log file, svn_wc_merge2 calls
svn_wc__run_log which runs all existing logs. When run from a log
file, there may exist more log files than the one we just created from
svn_wc_merge2. svn_wc__run_log runs *all* logs, not just the one we
need it to run...
One solution would be to create specific prefixes to the logs:
That way a caller can tell svn_wc__run_log *which* log file it wants
to run and overwriting of log files can be prevented; with the
exception of 1 case: an operation calls itself from a log file.
(Currently we don't do that: update calls merge, but merge doesn't
call update or itself.)
Pro: quite simple to implement
Con: we can no longer assume we run all logs by running log, log.1 ..
log.n; we'll need to find '*log' and run all logs from the result list
(which by extention of our old scheme runs *log.1 .. *log.n too).
Another solution - which would keep the log.1 ... log.n scheme without
prefixes - is to move the log file creation counter to the adm_access
structure and let svn_wc__write_log handle not overwriting existing
In this case, a system has to be created to run exactly 1 log file.
Con: The numbering of log.1 .. log.n may become discontinuous, so, we
need a system to find all logs (which is in effect the same problem as
Con: more invasive.
Well, I'd like some expert opinions on this one. I understand this
issue will need a wc-format bump, no matter which solution we choose.
Given the extent of the code which needs modifying, I don't think
proposing backport to 1.4 is realistic, so, it looks like 1.5 will
have a wc-format number bump too :-(
To unsubscribe, e-mail: firstname.lastname@example.org
For additional commands, e-mail: email@example.com
Received on Wed Jun 28 08:19:13 2006