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

Re: "svn resolve --accept=mine-full" is not loggy

From: Jeremy Whitlock <jcscoobyrs_at_gmail.com>
Date: Thu, 1 May 2008 11:41:15 -0600

> In addition to not being loggy, it isn't conditional on resolve_text,
> and it doesn't deal with subst when copying from a base file to the
> user's file.

1) The reason this isn't loggy is because this isn't a WC operation
that interacts with, or modified, the administrative data. This is
doing a file overwrite as if the user himself/herself opened the
conflicted file and made the requested change themself.
2) This only works for text-based conflicts so conditionality for text
shouldn't matter right now. (This approach is what was discussed at
the time of writing and while I agree that we could/should add
automatic property conflict resolution, it was not what was scoped out
for that patch/issue.)
3) Not an issue, as you realize in a later email. ;)

Feel free to create a new issue to extend this feature, or even fix if
that is what we decide. I'm still familiar with the code and related
Subversion bits.

Take care,


To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-05-01 19:41:44 CEST

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.