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

Re: svn:mergeinfo and revert

From: Ben Collins-Sussman <sussman_at_red-bean.com>
Date: 2007-07-07 02:32:09 CEST

Hm, I guess this awkwardness is the price we pay for tracking
mergeinfo in metadata that's normally the domain of user-editable
stuff, rather than tracking mergeinfo in (say) some private
client-side database.

My feeling is that 'svn revert' should take some sort of
--merge-sensitive switch or something, which would actually create a
prop-mod to override the inherited mergeinfo. As long as the user
passes that swtich, then revert will do the right thing. If the user
leaves the switch off, then *any* local mods will be destroyed,
including temporary prop-mods created by a previous revert.

We just need to doc this use-case very carefully in our
branching/merging chapter of the svnbook. :-)

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Jul 7 02:31:49 2007

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