Re: The "entries" file and un-doing an update

On Mon, Mar 21, 2005 at 06:02:34PM -0500, Dale Worley wrote:
> > From: Ben Reser [mailto:ben@reser.org]
> >
> > For your given example:
> >
> > svn revert f2
> > svn update -r rxxx f2
>
> I don't believe that that would recover the local modifications that were
> originally present.

cp f2.mine f2.mine.do.not.delete
svn revert f2
svn update -r rxxx f2
mv f2.mine.do.not.delete f2

> Ah, but the two revs are on different branches. That's what makes it
> impossible to recover what the previous BASE was.

Maybe the .mine file should be the rev placed in its name to help with
that too.

-- 
Ben Reser <ben@reser.org>
http://ben.reser.org
"Conscience is the inner voice which warns us somebody may be looking."
- H.L. Mencken
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org