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

Re: RFC: interactive conflict resoution callback

From: John Peacock <jpeacock_at_rowman.com>
Date: 2007-06-08 22:22:32 CEST

Daniel Rall wrote:
> svk can probably invoke conflict resolution on an as-needed basis
> without network I/O, because the repository is local.

A careful design should allow conflict resolution to be invoked only
after the network I/O has been completed, i.e.

1) merge automatically until
2) hit conflict, make note of it and keep the new file from the server
3) repeat 1 until completed
4) give the user a chance to resolve conflicts (or just mark files as
conflicted if --non-interactive flag is passed).

It isn't impossible to do without interfering with the network I/O, but
it probably would require that [complete] rewrite of the WC code that
everyone dreads... :(


John Peacock
Director of Information Research and Technology
Rowman & Littlefield Publishing Group
4501 Forbes Boulevard
Suite H
Lanham, MD  20706
301-459-3366 x.5010
fax 301-429-5748
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jun 8 22:22:22 2007

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.