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

Re: JavaHL bindings - force commit?

From: Davin McCall <davmac_at_deakin.edu.au>
Date: Fri, 07 Mar 2008 14:54:16 +1100

C. Michael Pilato wrote:
> Beginning in Subversion 1.5, you'll be able to do this:
>
> svn update /path/to/out-of-date/file --accept=mine -r105
> svn commit /path/to/out-of-date/file
>
> In prior versions, you had to run update on the file, let the conflict
> happen, and then scriptishly swap the .rMINE file atop your working
> file, run 'svn resolved' on the file, and then commit.
>

Thanks; but am I correct in thinking this "--accept" option is only for
merge-conflict resolution? That is, if the "svn update" command performs
the merge successfully, the "--accept=mine" has no effect and the local
file now has both the changes between r100 and r105 as well as the local
changes, which is not what I want. I want to ignore the changes between
r100 and r105 unconditionally.

Davin

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-03-07 04:52:35 CET

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