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

Re: [TSVN] Ignoring a commit and moving on

From: SteveKing <steveking_at_gmx.ch>
Date: 2005-02-26 08:39:49 CET

Gary Affonso wrote:
> I've got version 75 of my repository to which I've been making local
> (working copy) changes.
>
> Another developer has just committed 76 and 77, both of which I just want to
> throwaway. They contain problem code that's way easier to just ignore (and
> start over) than to try and merge.
>
> But I can't commit my latest working changes until I update to the latest
> head (77) which I do not want to do.
>
> So...
>
> Is there a way to, in essence, ignore the fact that commits 76 and 76 ever
> happened? Or delete them? Or commit "around them"? Or something?
>
> Any suggestions for how to handle this situation are greatly appreciated.

Well, just throw away something isn't what version control is all about.
  So there's no command available to permanently remove those commits.

But if you don't want to have these changes in _your_ commit, you can do
the following:
- export your working copy to another location (right-drag, "export")
- Update your working copy so that it contains all the changes the other
one made (you could revert your changes first so you don't get conflicts)
- copy your exported working copy over your real working copy. It then
will look exactly like your modified working copy before the update
(because you overwrote the files with your versions)
- commit

Stefan

-- 
        ___
   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
Received on Sat Feb 26 08:40:33 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.