Robert Segal wrote:
> I fear I have become entagled in a web of versioning trouble. Let me
> review my woes....
>
> I whom I will refer to as developer A committed some chanages this
> morning thinking hey this is great, everything is great. Little did
> I know that developer B had committed some changes before I had
> comitted my changes. This in itself is fine. When I went to commit
> my changes I updated to get the latest changes from developer B then
> committed my own. The problem is that as a result of these merges
> now the application we are working on is in a broken state. The
> changes that developer B had committed we're actually supposed to be
> committed to a branch he was working on. Unfortunately they we're
> commmitted to the trunk instead.
>
> Now I'm trying to figure out how I undo this mess. I have the latest
> revision which has my changes but several revisions before that which
> contain the trouble making versions. What I would like to do is
> merge the state of repository from before all this mess occured with
> changes made in the latest revision that has my changes but only the
> changed files from the latest revision. I don't want anything in
> between the last known stable state and the head revision. Would
> there be a way to do this? I'm trying to figure out various schemes
> of rolling back to a certain state and then adding the files I have
> changed. Something like that. Any help would be greatly appreciated.
Standard advice: reverse merge the problem revision(s). If dev b
committed his changes in revision 42:
svn merge -r42:41 <repository>
Test to make sure everything still works & the bad code's gone, and
commit. You shouldn't need to reverse merge any of the subsequent
changes out, as long as the problem commit was fairly recent...
Incidentally, you say that you updated and then committed; did you test
between those two operations? One thing I learned early on was the
importance of testing whenever I've updated in someone else's code
changes, just in case of an unflagged (logical) collision.
-David
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jan 26 20:05:02 2006