Mark Phippard very kindly took on board my comments, and added a FAQ to subversion as well as raising an issue for this. A couple of things are worth noting:
1) I should have used 'svn revert' rather than editing the entries file by hand. "mv new.file new.file.old; svn revert new.file" will apparently do the work 2) A new subversion option --force is in the works (svn 1.5), which will overwrite any local changes. It only applies to update files, but if the below issue is addressed it should allow for added files too. However, I think that the --force will discard any local changes, even if you've made subsequent edits since the patch was fled, so it might still be an idea to rename it to a separate file so that you can do manual diff checks. Thanks, Mark! Alex. ---------- Forwarded message ---------- From: Mark Phippard Date: 12-Aug-2006 14:04 Subject: Re: Re: Adding new files to SVN and subsequently trying to update To: Alex Blewitt OK, the FAQ has been added: http://svn.collab.net/viewvc/svn?view=rev&revision=21056 http://subversion.tigris.org/faq.html#obstructed-add And also an issue has been filed: http://subversion.tigris.org/issues/show_bug.cgi?id=2593 Thanks Mark --------------------------------------------------------------------- Terms of use : http://incubator.apache.org/harmony/mailing.html To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
