Ok, here's the scenario: I make a website together with a friend, he is not a programmer. He has a 'normal' folder htdocs, where he does html, layout, swaps images and adds pages.
I do the scripting. I have a repository with htdocs (it is the trunk). I checked it out and am working on it. Now my friend sends me a zip with his htdocs folder. Remember, this is not a working copy, it has no .svn folders, it is not svn-aware so to speak.
How can I compare what he did with my working copy/trunk? I really want to know all that happened, deleted, replaced, edited files, new folders, etc.
Here some options I have played with (with no succes):
1. Copy over my wc. Doesn't tell me what he deleted, plus I'm not comfortable with it.
2. Import folder contents into trunk. Doesn't seem to work (error: file already exists).
3. Copy trunk to a branch, check it out to wc, empty, and then copy all files to wc and check it back in. The copying to the emptied wc gives problems: either access denied if the folder was emptied with svn, or 'obstructed' folders if explorer was used to empty the wc.
4. Import folder into new empty branch. Probably not ok, because the branch was empty, so it has no 'memory' of files from the trunk (like it would if you copy the trunk to a new branch).
Anyway, I am now in this situation: I have the trunk (with my latest work), 1 copy of the trunk in a branch, and 1 new branch with the files imported.
What should I do? Is this such a 'weird' scenario, or am I missing something obvious here?
Last updated