Reversing an update that resulted in a conflict

[Dale Worley <dw...@pingtel.com>]

Here is an operation I occasionally want to do, but I can't see any simple
way to do it:

Suppose I have a locally modified file, and I do an update that results in a
conflict.  Suppose I want to restore the file to the state it was in before
the update.  That is, I want the file contents to be what is now in
"file.mine", and I want its BASE to be what it was before the update.  Now,
it's clear how to do the first part, just move "file.mine" to "file".  But
how do I accomplish the second part, resetting BASE, without some messy
sequence of "svn revert", "svn update -r...", and then moving "file.mine" to
"file"?  It seems like there ought to be a simple command for this.

Thanks,

Dale


---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org