Re: Subversion misery
Re: Subversion misery
- Subject: Re: Subversion misery
- From: Quincey Morris <email@hidden>
- Date: Sat, 27 Mar 2010 12:19:11 -0700
On Mar 27, 2010, at 10:45, Matthew Weinstein wrote:
> I've been using subversion (@ sourceforge) for a few months to provide an archive and record of changes and now have run into problems. Hoping someone can tell me how to proceed. What happened was that I was off the web for about a week, I had a set of fixes that I wanted to commit, and then to keep working... So, I simply zipped up my directory at the commit stage, went back to working on the next release. When I got home, I unzipped my archive, committed, and then deleted that and continued with the directory that had the additional changes. Subversion is not happy. It has given me a bunch of files with "U" next to their name and I can't figure out how to say to it, commit this file or the whole project, for that matter without getting an error:
>
> Error: 155015 (A conflict in the working copy obstructs the current operation) Description: Commit failed (details follow):
> Error: 155015 (A conflict in the working copy obstructs the current operation) Description: Aborting commit: '/Users/matthew/prog/TA3/TASVN/TA From SVN/tamsanalyzer/English.lproj/InfoPlist.strings' remains in conflict
Most likely things went off the rails when you "zipped up" your directory. Because of the invisible .svn subdirectories, you can't just swap directories in and out within the project source hierarchy.
You might get lucky and fix things by fiddling (the error message says there's a conflict in InfoPlist.strings, so you might be able to resolve that by editing it slightly), or you may have to check out a fresh copy of the project, and fix it manually, by pasting in text, or moving in individual source files (but never directories) from the old, tainted directories.
_______________________________________________
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