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

RE: Re: diff3 followups

From: Bill Tutt <rassilon_at_lyra.org>
Date: 2002-03-14 03:25:47 CET

> From: Kevin Pilch-Bisson [mailto:kevin@pilch-bisson.net]
> On Wed, Mar 13, 2002 at 05:17:27PM -0800, Bill Tutt wrote:
> >
> >
> > I'd rather have the 'svn resolve' command and force the user to
> > the result of any merge conflict. This would mirror into a UI action
> > mark the conflict as resolved. (As opposed to VSS's silly question
> > invoking a Checkin: "Are you sure you've resolved all conflicts?")
> > the user be a responsible developer and manually have to resolve the
> > conflict.
> I now agree with this approach instead. Firstly, it does make more
> for
> binary files. Secondly, it is a clearer interface than "You have to
> change
> the file before you commit." It instead becomes "You have to run svn
> resolve"
> to mark the changes as resolved. One question though, does svn
resolve do
> anything other than remove the three backup files?

All it has to do is remove whatever working copy state exists that
indicates the conflicting state. It might need to remove some attributes
in the WC entries XML file, or whatever else might be appropriate.


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Mar 14 03:26:24 2002

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