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

Re: [issue 2022]: merge and update touches conflicted files

From: Nik Clayton <nik_at_ngo.org.uk>
Date: 2007-01-24 17:42:00 CET

Peter Lundblad wrote:
> A more sophisticated solution would be to Skip this target, leaving it
> as is and possibly warn the user at the end of the operation that not
> all targets were processed correctly and that the operation needs to
> be restarted after the conflict is rresolved.

When you say "restarted", do you mean that the user should be able to run
the same "svn merge" command and have it do the right thing?

I imagine it won't, because it will try and merge in the changes that have
already been merged in to the files that weren't in conflict. Generating
conflicts in those files instead.

If it's going to behave like that I'd rather it didn't. How much effort
would it be for "svn merge" to scan the working copy first (or those files
in the working copy that will be affected by the merge), checking for any
files that are marked as conflicted, and refuse to merge anything if any
files are in conflict.

N

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Jan 24 17:42:54 2007

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