[SVN] Bundle commit 454
Kumar McMillan
kumar.mcmillan at gmail.com
Wed Mar 9 21:46:00 UTC 2005
oh I see, will remember that for the future, thanks.
I don't know why svn didn't let me commit the file after I updated it
to an older version. That seemed to me the most logical way to do it.
On Wed, 9 Mar 2005 16:21:20 -0500, Kevin Ballard <kevin at sb.org> wrote:
> Erm, that's a strange way to do it. The best way to back out of a
> change is to update to head, then merge the change backwards into the
> file. This is especially the only way to back out of a change if
> there's been other changes since then that you want to keep.
>
> Example: HEAD is r657. r628 modified a file in a bad way, but several
> good changes have been made to the file since then that you don't want
> to lose. Here's how to remove the r628 change:
>
> svn update myfile
> svn merge -r 628:627 myfile
> svn commit myfile
>
> Basically it applies the diff in reverse. Of course, you could get
> conflicts if the bit you're reverting had been changed since the
> initial bad commit, but those can be fixed by hand (or you could revert
> the other changes first, assuming they're not ones you want to keep).
>
> On Mar 9, 2005, at 4:15 PM, Chris Thomas wrote:
>
> > Subversion remembers (locally, not remotely) the version you have
> > checked out. To back out a change, you can update to HEAD (just "svn
> > update"), check out the older version >somewhere else<, then replace
> > the file at HEAD, then svn commit.
>
> --
> Kevin Ballard
> kevin at sb.org
> http://www.tildesoft.com
> http://kevin.sb.org
>
>
> _______________________________________________
> textmate-dev mailing list
> textmate-dev at lists.macromates.com
> http://lists.macromates.com/mailman/listinfo/textmate-dev
>
>
>
>
More information about the textmate-dev
mailing list