Re: Another subversion dilemma
Re: Another subversion dilemma
- Subject: Re: Another subversion dilemma
- From: Christiaan Hofman <email@hidden>
- Date: Tue, 22 Jun 2010 02:28:05 +0200
On Jun 22, 2010, at 1:23, Scott Cherf wrote:
>
> On Jun 21, 2010, at 3:34 PM, Matthew Weinstein wrote:
>
>> It is the XCode angle that has me troubled. In the past if I've tried to do anything in my working directory not done by XCode XCode will then cease committing things, and give all sorts of errors
>
> Matthew -
>
> It's difficult to say for sure, but it sounds as if you've tried deleting a directory under SVN control then copying files from another place into your Xcode workspace expecting that the changes will then be picked up and an Xcode commit will send the modified files off to the SourceForge repository, yes?
>
> If so, your problem is that when you delete the working directory (the one Xcode is using) you also delete all the SVN control files that are in the directory (you'll find them under '.svn' in each directory that's under SVN control). Deleting those directories is very bad and will hose up SVN in ways that are to horrible to describe; blood will begin flowing freely from every pore of your body, the sky will open and rain nasty stuff on you and all your descendants. Life will never be the same.
>
> You'll need to individually replace the files you've changed by copying them, use 'svn add' or 'svn delete' to adjust the repository for any files you've added and deleted, etc.
>
> This isn't exactly an Xcode topic. Had you performed all of the changes in Xcode then you would have not had the difficulties you're having. Because you're doing it manually you'll need to read up on SVN. There's a manual available on the web that's free, Google it.
>
> Scott.
Actually, deleting the files and the directory structure including the .svn directories is not really the problem. It's rather that Xcode's support for svn with /replacing/ folders is still buggy. In theory you should just be able to first delete the folder in Xcode (making sure you confirm to also remove it from SCM), then add the new folder to Xcode, and finally add it to the repository. The first two steps work OK, but somehow Xcode refuses to do the last step, which should be considered a bug in Xcode. It should work though of you first commit after deleting the old folder.
If you do the above from the command line, all works fine. Just "svn rm" the folder first, then copy the new folder in place and use "svn add" to add the folder (this is recursive). This is by far the easiest and quickest way for a large number of files and/or a deep hierarchy. Afterwards, make sure you "refresh entire project" in Xcode's SCM menu.
If you just have a few files in the folder, then you can replace the content files one-by-one as proposed above, but it's tedious.
All these proposals have one drawback, that may however not be to important for you: the history of files that were changed (AOT deleted/added) will be lost. In order to keep the history for those, you should replace the individual files (not the folder(s)) outside Xcode, and you also have to "svn rm" the files that were removed and "svn add" the files that were added. You can do the adding and removing from Xcode, though you can only remove when the file was not actually removed yet.
Christiaan
_______________________________________________
Do not post admin requests to the list. They will be ignored.
Xcode-users mailing list (email@hidden)
Help/Unsubscribe/Update your Subscription:
This email sent to email@hidden