It looks like I’ve got myself into a proper mess.

I’m working on a new phpBB skin, with the original “prosilver” and my new one “netAirspace” both under SVN, under a “styles” directory in the same repository. The prosilver one should remain untouched – it’s there for reference only. All development should be going into netAirspace.

As one is based on the other, I obviously did a massive cut/paste, committed it all, and went on my merry way. I’ve been working from the netAirspace directory on my hard disk for about 60 commits. Everything’s appeared normal.

Today, for the first time since setting this up, I looked at the repository through the Unfuddle site. To my horror, I found that “netAirspace” is on r3 and “prosilver” is on r60-odd. Further inspection of my working copy reveals that these two directories look to be identical.

Cause (I think)
-——————

It looks as if that over-eager copy/paste on my part is responsible for this mess. I’ve included the relevant all-wcprops files at the end of this post, and both appear to be pointing to the prosilver directory.

Fix
-

This is where I get hazy :)

What I want to happen is for /prosilver to go back to how it was at r3, ideally looking like nothing had happened to it since, and for /netairspace to look like prosilver does now, ideally with all the revision history. Effectively, swapping the names of the two directories would accomplish this – and then I’d blow away my working copy and check it all out again, and I should be set.

Is there anything I can do through Subversion? I use TortoiseSVN, but am happy to install a command-line utility if it’s the only way to do the job.

I can get myself straight for the future, I think – if I have to, I can reconstruct it all as it should be now, commit it, and say that everything before that is bogus. But then, I’m effectively going to lose my revision history. I’d very much prefer to avoid that if possible.

Thanks in advance!
Ed

Files
-—

/styles/prosilver/.svn/all-wcprops:

K 25
svn:wc:ra_dav:version-url
V 62
/svn/netairspace_site/!svn/ver/62/trunk/forum/styles/prosilver
END
style.cfg
K 25
svn:wc:ra_dav:version-url
V 71
/svn/netairspace_site/!svn/ver/4/trunk/forum/styles/prosilver/style.cfg
END

/styles/netAirspace/.svn/all-wcprops:

K 25
svn:wc:ra_dav:version-url
V 62
/svn/netairspace_site/!svn/ver/61/trunk/forum/styles/prosilver
END
style.cfg
K 25
svn:wc:ra_dav:version-url
V 71
/svn/netairspace_site/!svn/ver/4/trunk/forum/styles/prosilver/style.cfg
END

I gave up.

Saved a copy elsewhere as /netAirspace (the one that should be in development)
Reverse-merged working copy back to r3, where this all started
Saved a copy of that elsewhere as /prosilver (the one that should be untouched)
SVN deleted parent of both directories (/styles) from working copy
Committed
Removed all .svn directories from backup copies of /netAirspace and /prosilver
Re-created /styles in working copy
Copied backups of /netAirspace and /prosilver into /styles
SVN added /styles
Committed

It’s now fixed for the future, but obviously any merges, etc, that cross this point are going to be hopelessly wrong.