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

Re: Regression: Interactive merge support

From: Erik Huelsmann <ehuels_at_gmail.com>
Date: 2006-07-01 17:58:33 CEST

On 6/23/06, Julian Foad <julianfoad@btopenworld.com> wrote:
> Erik Huelsmann wrote:
> > 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.
> [...]
> > 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
> Will this also bring us much closer to atomic updates - in other words, greatly
> reduce the chance of an update failing part way though? That would be lovely.

I'm not sure which problems all together make up the fact that updates
of working copies are non-atomic.

I did find out though that we used to run merge at a per file bases,
now we group all merges on a per directory basis.

My change (see 'Fix issue 1914') will bring that back to doing it per
file, leaving it to the close_directory routine to install the working
copy changes calculated by the per-file merges.

Hope that clarifies it a bit?



To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Jul 1 17:58:58 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.