Thanks to all who posted. The formula appears to be:
1) duplicate the current working copy (via export or whatever)
in the original working copy
2) revert
3) update to HEAD
3) reverse merge to the commit I like
4) commit
In the duplicated WK (with my pending changes)
5) commit
Thanks!
- Gary
On 2/25/05 5:55 PM, "Gary Affonso" <glists@greywether.com> 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?
>
> I know how to do a reverse-merge to undo changes, but I can't perform that
> rollback unless I update to the latest head, right? But if I do that I'm
> gonna get the 76 and 77 changes I don't want merged into my good code.
>
> I could:
>
> * switch my stuff to a branch and commit
> * switch back to the trunk and update to the head
> * do the reverse merge and the re-commit
> * merge my branch back into the trunk
>
> Is there an easier way?
>
> Any suggestions for how to handle this situation are greatly appreciated.
>
> Thanks,
>
> - Gary
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
> For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Feb 26 19:33:36 2005