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

How is svn resolved handled for tree conflicts? (was: Re: svn commit: propchange - r28884 - svn:log)

From: Stefan Sperling <stsp_at_elego.de>
Date: Wed, 16 Jan 2008 17:26:51 +0100

On Mon, Jan 14, 2008 at 10:10:37AM -0500, David Glasser wrote:
> 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?

Well, by carrying out any changes necessary to clean up the conflict :)

This may involve making decisions about things like moving a file's
content to a different file, deleting a file or renaming a file,
for example.

It depends on the case at hand. In any case, Subversion does not try
to be smart about what it takes to resolve the conflict. Upon "svn
resolved" the meta data is cleared and users are expected to know
what they are doing.

I will post a report about the current status of the branch shortly,
there will be an example in there that might make this more clear.

-- 
Stefan Sperling <stsp_at_elego.de>                 Software Developer
elego Software Solutions GmbH                            HRB 77719
Gustav-Meyer-Allee 25, Gebaeude 12        Tel:  +49 30 23 45 86 96 
13355 Berlin                              Fax:  +49 30 23 45 86 95
http://www.elego.de                 Geschaeftsfuehrer: Olaf Wagner

  • application/pgp-signature attachment: stored
Received on 2008-01-16 17:27:04 CET

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