recover from merging twice?

I hope this isn't getting posted twice. I merged from trunk into a branch twice incorrectly, I think. For example:

cd mybranch
svnversion -> 4

# the branch was created on revision 2
# trunk's revision is 9

svn -r 2:9 http://some/svn/trunk
ci
svn revision -> 13

# a week goes by
# trunk's revision is 23

svn revision -> 19
svn -r 2:23 http://some/svn/trunk
ci
svn revision -> 28

#oops! that should have been -r 9:23

So, I think I need to go back to revision 19 in the branch and then do the correct merge. But I'm failing to go back, so far.

After checking out the source before the second merge:

svn co http://some/svn/branches/mybranch before

I tried:

cd mybranch
svn -c -28 http://some/svn/branches/mybranch
cd ..
svn diff mybranch before

But there are differences!

I also tried (with cleanly checked out source each time):

# 27 is what the log shows as the most recent change
svn -c -27 http://some/svn/branches/mybranch

svn -r 28:19
svn -r 27:19

And I tried reversing the second merge:

svn -r 23:2 http://some/svn/trunk

All, result in differences from revision 19.

What can I do?

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2020773

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-05-02 18:32:00 CEST