Fwd: Re: Adding new files to SVN and subsequently trying to update

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

Re: Adding new files to SVN and subsequently trying to update

I wrote a perl script to deal with these things: 1. check svn status on some directory 2. execute svn add if necessary 3. execute svn diff to create diff file 4. create a shell script with svn add/remove instructions, which is useful for the committer to apply the patch 5. revert to original

Re: Adding new files to SVN and subsequently trying to update

Hi, I did not say that it solves all problems, but at least you do not need to do svn add each time you add a new file and want to create a patch. Regards, 2006/8/10, Oliver Deakin [EMAIL PROTECTED]: I use TortoiseSVN also - I just tested it out by creating a dummy

Re: Adding new files to SVN and subsequently trying to update

Can't even friggin delete it ... apple[pack200] svn up subversion/libsvn_wc/update_editor.c:1541: (apr_err=155000) svn: Failed to add file 'JustResources.pack': object of the same name is already scheduled for addition On 10/08/06, Alex Blewitt [EMAIL PROTECTED] wrote: One thing that annoys me

Re: Re: Adding new files to SVN and subsequently trying to update

OK, so for anyone else reading this thread (or googling for 'object of the same name already exists'): 1) If it's a case insensitive filing system (e.g. Windows) then see the Subversion FAQ: http://subversion.tigris.org/faq.html 2) If it's a case senstive filing system, and the case is right,

Re: Adding new files to SVN and subsequently trying to update

Hi Alex, I think you can't just delete the file once youve done an svn add on it. I think svn stores some metadata (I believe in the .svn/entries file) about the files you've added, and so doing a plain delete of the file without telling svn will leave the metadata laying around. Normally if I

Re: Adding new files to SVN and subsequently trying to update

Just sent my other mail before seeing this one. Rather than manually editing the entries file you can, as I suggest in the other mail, still revert the original file name after you have moved it to a new file. So you could: - move the file to a new name AddedFile.java.bak - svn revert

Re: Adding new files to SVN and subsequently trying to update

Alex Blewitt wrote: Yeah ... the problem is that unless you do an 'svn add', it doesn't show up when you have an 'svn patch' or similar (see other swearing, ranting etc. about missing files). So, I've got to add, patch, submit, wait, hack/revert, diff each new file I add ... Yeah, if you want

Re: Adding new files to SVN and subsequently trying to update

I use graphical TortoiseSVN client and do not remember much pain with file addition. It seems TortoiseSVN does some part of the stupid job by itself. I believe there should be something like it on *NIX too. Regards, 2006/8/10, Oliver Deakin [EMAIL PROTECTED]: Alex Blewitt wrote: Yeah ... the

Re: Adding new files to SVN and subsequently trying to update

I use TortoiseSVN also - I just tested it out by creating a dummy modules\tools\src\main\java\org\apache\harmony\tools\keytool\KeyCertGenerator.java file and trying to update to pick up Mikhails latest changes (which add this file to the repository). Unfortunately TortoiseSVN gives me an error