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

RE: Troubles updating repository to a stable state

From: Robert Segal <rsegal_at_3dna.net>
Date: 2006-01-26 22:57:33 CET

Thanks for the suggestions Paul. I would agree that your process should
work but I have another wrench to throw into this equation. I am attempting
to merge the revision from the point where the bad commit was made to just
before it was made as I believe you suggested Paul. However in my case
there are multiple versions comitted which are bad. Normally I wouldn't
have a problem with this. I would assume the merge range would be something
more along the lines of

  svn merge -r 123:110 http://path/to/repo/trunk

Just an example of course but you get the idea. The nice "wrench" I am
introducing is that in that range of wrong changes a folder was deleted. I
shall say at around version 112. Then in revision 114 that folder was
readded. So now when I go to merge from 123 to 100 I get an error message
along the lines of...

  "Revision 110 doesn't match existing revision 123 in

My thought is that SVN is getting confused because this folder that was
deleted and then readded is actually two different folders although it has
the same name throughout the course of the wrongfully committed revision

Any thoughts how I might get around this? It seems any of my attempts to
rollback end up crashing because the repository has been restructured quite
a bit in the most recent set of revisions.

David Gale wrote:
>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.

I would definitely agree this is good practice. Normally I do this but I
believe my brain was slacking at that particular moment and I don't believe
I did this. Oh well now I pay the penalties. Thanks both for your

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jan 26 23:08:21 2006

This is an archived mail posted to the Subversion Users mailing list.

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