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

Re: stop doing conflict-producing operations on already conflicted files

From: Ben Reser <ben_at_reser.org>
Date: 2004-09-01 23:30:30 CEST

On Thu, Aug 26, 2004 at 07:00:25PM -0000, kfogel@tigris.org wrote:
> Putting in unscheduled for now. If we shouldn't merge into already-conflicted
> files, what should we do instead?

Error out that the file is conflicted. If the file is conflicted that
means it has conflict markers in it, so it's not going to be possible to
have a logical merge anyway...

Ben Reser <ben@reser.org>
"Conscience is the inner voice which warns us somebody may be looking."
- H.L. Mencken
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Sep 1 23:31:08 2004

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.