SVN merge previous revision into working copy

Question

If

• I'm working on an SVN branch at revision 5.
• I make a change, commit to create revisions r6.
• Revert back to r5 as r6 introduced problems, and commit, creating r7
• Continue working on r7, eventually committing changes up to r10

How do I merge the changes made in r6 back into my working copy?

I've tried

svn merge -r5:6 .

and

svn merge -r5:HEAD .

Both of which seem to do nothing. What am I doing wrong?

Answer 1

Try this:

svn merge --ignore-ancestry -r5:6 .

or using newer syntax:

svn merge --ignore-ancestry -c6 .

b.t.w.: I recommend to always specify what files you want to work with instead of "."