Re: JavaHL bindings - force commit?

Davin McCall wrote:
> Surely there is there some way to do this (from the command line)?
> (Ideally, it would involve specifying that I specifically want to
> replace revision 105, so that if there have been subsequent commits that
> I'm not aware of I will still get a conflict; that is, the commit would
> not be totally unconditional).

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.

-- 
C. Michael Pilato <cmpilato_at_collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand