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

svn resolve --accept option

From: Gavin Baumanis <gavinb_at_thespidernet.com>
Date: Thu, 11 Oct 2012 12:42:28 -0400

Hi Everyone,

 

I just recently had cause to resolve a tree conflict, so I used the
following;

svn resolve www\en\assets\Homepage_Images

 

from this I received the following error message;

svn: E205000: Try 'svn help' for more info

svn: E205000: missing --accept option

 

so I entered the following;

svn resolve www\en\assets\Homepage_Images --accept theirs-full

 

which gave me;

svn: warning: W155027: Tree conflicts can only be resolved to 'working'
state; 'C:\Matilda\www\en\assets\Homepage_Images' not resolved

 

 

So ultimately my question is;

If you are performing a 'svn resolve --accept' why isn't the "working"
attribute just assumed / enforced internally?

 

I can see the value in making it a "positive" choice to actually have to
choose "working" - as opposed to it being an assumption, but since it is the
only available option - Is it really such a big deal to have the automatic
treatment?

 

 

Gavin.
Received on 2012-10-11 18:43:11 CEST

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