Commit from directory, not under version control, to override current revision

Question

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.

Amber · Accepted Answer · 2009-08-03 07:01:38Z

3

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.

answered Aug 3, 2009 at 7:01

Amber

531k89 gold badges643 silver badges558 bronze badges

Sign up to request clarification or add additional context in comments.

6 Comments

guerda Over a year ago

Your idea is good, I propably can use it. The problem is that there are files in X that are not in X+1.

gbjbaanb Over a year ago

that's not a problem, only the changed files will be committed, if you have files in X+1 that are not in X, that's a different matter - you'll have to add them before the commit.

guerda Over a year ago

But I don't want to have these files in head. The other aspect is in the edit of my question: I don't know which revsion X is.

Amber Over a year ago

Hmm. If you remove all of the files from a checked out working copy of the head (but leave the .svn directories), and then paste in the contents of your X+1 directory, you could then probably do an svn diff to determine what has changed between your X+1 copy and the current head.

guerda Over a year ago

That's a neat way... I'll try it.

|

Collectives™ on Stack Overflow

Commit from directory, not under version control, to override current revision

1 Answer 1

6 Comments

Your Answer

Hot Network Questions

Collectives™ on Stack Overflow

1 Answer 1

6 Comments

Your Answer

Sign up or log in

Post as a guest

Related