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

RE: [TSVN] rollback/undo changes - Update Item to revision or Revert changes from this revision - then commit fails?

From: Charles Doucette <cdoucette_at_cornerstonetech.com>
Date: 2005-05-06 18:53:26 CEST

Well - I chose SVN Revert changes from this revision.
It seemed to work because:
a) it gave me a progress dialog
b) the diffs were what I expected (it undid the change in that revision)
c) it appears that I can commit from this state.

So, Update to revision will change the base revision but not allow you
to commit
(because at least that file is not based on the head revision)? The
documentation
claims that you should update a whole directory at once - but you can't
commit that either - right?
So, Update is only a temporary fix - right?

The basic subversion documentation implied that I could also use a copy
command
to restore an old version. Is that applicable only after I've deleted
something?
How could I use TortoiseSVN to copy an old revision on top of the
current one rather than
update or merge?

Thanks,
Chuck

> -----Original Message-----
> From: Simon Large [mailto:slarge@slarge.plus.com]
> Sent: Friday, May 06, 2005 11:30 AM
> To: dev@tortoisesvn.tigris.org
> Subject: Re: [TSVN] rollback/undo changes - Update Item to
> revision or Revert changes from this revision - then commit fails?
>
> Charles Doucette wrote:
> > We committed a bad or premature change.
> > We were able to roll bit back on the web server; but, we
> are unable to
> > commit that change to our SVN repository.
> >
> > let me be specific - the files are called ReviewImport.aspx and
> > ReviewImport.aspx.vb
> >
> > The last good versions were committed in revision 743.
> >
> > The bad/premature versions were committed in revision 773.
> >
> > The current repository revision is 776.
> >
> > We looked at the Log Dialog for this file and chose Update Item to
> > revision (we had selected the good revision 743) I assume this is
> > equivalent to the SVN command line copy.
>
> No, it is equivalent to svn update -r743
>
> > We also considered using Revert changes from this revision.
> > I assume that is equivalent to the SVN command line merge?
>
> Exactly right. But before you can do anything useful you need
> to update your working copy again. Your current WC has these
> files at an earlier revision, so you can't commit them. You
> can only commit files at HEAD.
>
> > If I do that - would I choose the bad version instead (ie. revision
> > 773)?
>
> I am assuming that if you do a show log for this file it shows:
> 773 Committed some bad changes
> 743 Committed a known working version
>
> and no changes in between?
>
> If that is the case, just select r773 and do 'revert changes
> from this revision'. That will effectively merge that change
> back out again, equivalent to svn merge -r773:772 MyFile
>
> The changes are only in your WC, so you then need to commit.
>
> Simon
>
> --
> ___
> oo // \\ "De Chelonian Mobile"
> (_,\/ \_/ \ TortoiseSVN
> \ \_/_\_/> The coolest Interface to (Sub)Version Control
> /_/ \_\ http://tortoisesvn.tigris.org
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
> For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri May 6 18:59:11 2005

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