The title is propably misleading so I try to explain my situation.
I have a Subversion repository and a revision that is older than the head revision, I call it now revision X. My revision was changed (X+1) and ripped off the version control system. There are no .svn directories or something like this in this local folder.
I would like to commit this X+1 revision to my repository as head. My problem is how to do this.
It’s kind of a branch but it’s not done correctly so I have to face this problem now.
All changes made between X and head should not be in the new head, but all changes between X and X+1 must be in head.
I hope my explanation is understandable.
Edit:
I don’t know, which revision X is. I just have the non-versioned working copy without any information. That’s the biggest problem. Sorry for not mentioning this.
Fastest way would probably be to checkout the repository to a different folder, revert it to version X, then copy your “X+1” files to the working copy you checked out, overwriting any existing conflicts, and then commit.