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

Regression: Interactive merge support

From: Erik Huelsmann <ehuels_at_gmail.com>
Date: 2006-06-22 23:51:50 CEST

Way before 1.0, we used to build up 1 enormous log file with all
commands to bring a working copy in order after 'svn up'. This had the
additional benefit that any command written to this log would be
processed after all network activity was done. In order to support
'Interactive merge tools' we dry-run--internal-(non-interactive)-merge
while receiving network data, but write a log-command to do the actual
merge at log processing time (possibly using [external] interactive
tools).

To improve performance, we split up this enormous log into several
small logs. Most of these log files are processed at close_file-editor
callback time. This will be (most of the time) in the middle of
network activity.

The above probably means that we have regressed at supporting
interactive merge tools.

Comments?

I hope to change libsvn_wc so that we can run the actual merges at
close_edit/finish_report time (ie: after all network traffic). But in
order to do that, we may need a way to record - on disc - the fact
that files have to be merged. Same as log files, to support svn
cleanup.

I could use a good idea or two for that too...

bye,

Erik.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jun 22 23:52:39 2006

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