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

Re: svn commit: propchange - r28884 - svn:log

From: David Glasser <glasser_at_davidglasser.net>
Date: Mon, 14 Jan 2008 10:10:37 -0500

I'm a bit confused about how "svn resolved" is used for tree conflicts.

For text conflicts, what "svn resolved" means is "I've made the text
of the file be what I want by editing it; clear the conflict
metadata". For props, it's "I've made the prop be what I want by
using svn propset/propedit; clear the metadata". I can see that for
tree conflicts it still means "clear the metadata" (which makes
sense), but how does the user actually fix the conflict and indicate
their desire?

--dave

On Jan 14, 2008 7:14 AM, <stsp_at_tigris.org> wrote:
> Author: stsp
> Revision: 28884
> Property Name: svn:log
> Action: modified
>
> Property diff:
> --- old property value
> +++ new property value
> @@ -1,3 +1,5 @@
> +On the tree-conflicts branch, teach "svn resolved" about tree conflicts.
> +
> * subversion/include/svn_wc.h:
> (svn_wc_resolved_conflict4): New function. Same as svn_wc_resolved_conflict3,
> but can also resolve tree conflicts.
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe_at_subversion.tigris.org
> For additional commands, e-mail: svn-help_at_subversion.tigris.org
>
>

-- 
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-01-14 16:30:54 CET

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