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

[RFC] - New option to resolve conflicts on merge/resolved commands

From: Mark Phippard <markphip_at_gmail.com>
Date: 2007-05-23 02:16:04 CEST

On IRC, dlr, epg and myself were discussing merge. Eric, mentioned
that he wished we could do svn resolved --accept=mine | yours | orig.
This would resolve the conflict by selecting the file specified in the
option.

He later went on to suggest that the same option could also be added
to the merge command. This situation would most likely be used by
automated merge scripts.

I think this seems like a great idea, even if we only did it for
resolved. I am just looking for some general +1's so I can file it as
an issue in the tracker. Of course, if someone thinks this is a bad
idea, then even more important to speak up.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed May 23 02:16:15 2007

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