On Mon, Mar 14, 2011 at 4:38 PM, Ryan Schmidt
<subversion-2011a_at_ryandesign.com> wrote:
>
> On Mar 14, 2011, at 13:57, rupert.thurner wrote:
>
>> the eclipse cvs client allows to reject a change by simply clicking
>> "mark the local file as merged", and commit it.
>>
>> There are multiple enhancement requests filed against sublicpse which
>> get rejected because "svn does not offer such a feature via API" and
>> "we (subclipse) do not tinker with your files, except via svn API",
>> see e.g. http://subclipse.tigris.org/issues/show_bug.cgi?id=761.
>>
>> Alone from the number of requirements its seems pretty clear that
>> users do want this feature. But I am wondering what the correct place
>> to implement would be? Or to put it in other words, if one would
>> implement the feature into the svn command line client, where would
>> this feature go? above or below the API?
>
> Perhaps you could begin by explaining what the feature is? For the benefit of those of us who are not familiar with Eclipse CVS or its "mark the
> local file as merged" feature.
SVN 1.6 allows you to do:
$ svn up --accept=mine
Which is probably close to what he is asking. The problem is that
option only applies when there are conflicts. If you are previewing
an update and decide that you just want to keep your local version in
favor of the repository then this option would only have an impact if
svn could not update the local copy without conflicts.
--
Thanks
Mark Phippard
http://markphip.blogspot.com/
Received on 2011-03-14 22:19:13 CET