This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.
Product Version = NetBeans IDE 7.0.1 (Build 201107282000) Operating System = Windows XP version 5.1 running on x86 Java; VM; Vendor = 1.6.0_26 Runtime = Java HotSpot(TM) Client VM 20.1-b02 The subversioning isn't working properly as my colleague committed some new css files to the SVN repository and they failed to show up on update. I tried a new checkout, which caused it to show a conflict with local tree. I went on to tell it to resolve the conflict, but the new file never appeared in my project, which I found extremely odd. I have posted this issue on the netbeans forum and still waiting a reply, see URL below. http://forums.netbeans.org/viewtopic.php?p=120314#120314 Also I committed a file today, which is still committing upon writing of this issue which has been doing this for over 15 minutes. Any help would be greatly appreciated.
Regarding your mailing list posts: 1) Team -> Checkout into an already checked out working copy is really weird. I a not surprised it ended up with a tree conflict. If you want to checkout, do it into an empty folder. 2) Tree conflicts: > Do you want to resolve the conflict by accepting the working copy state? > I selected YES and it said it was updating, but when it finished ther new file wasn't in the project. The conflict icon (RED) has now changed to normal (BLUE) one. Sure, it is now blue because you have now local changes. You accepted your current working copy state and overwrote the state in repository. If you want to accept the repository state, Revert your modifications. Now to your report: > they failed to show up on update Are they listed in the Versioning view (Subversion -> Show changes) with Local&Remote changes toggle button selected? If so, try to update via popup menu on the files. Any help? If not, attach the messages log after you update (~\.netbeans\version\var\log\messages.log). Then try to update from console: 'cd' to the folder where the new files should appear, check if they are not already there and then run 'svn update'. Do they show up?
any update?
Created attachment 114167 [details] Message Log 2) Tree conflicts: > Do you want to resolve the conflict by accepting the working copy state? > I selected YES and it said it was updating, but when it finished there new file wasn't in the project. The conflict icon (RED) has now changed to normal (BLUE) one. Sure, it is now blue because you have now local changes. You accepted your current working copy state and overwrote the state in repository. If you want to accept the repository state, Revert your modifications. I did accept the changes and I these files that came up with a tree conflict didn't exist on my local copy, therefore I thought it should just be adding them to my local copy. I have logged on to the repository area on the server and checked the files are still there. So not too sure on that front, might be the combination of flu, medicine and lack of sleep kicking in though. Now to your report: > they failed to show up on update Are they listed in the Versioning view (Subversion -> Show changes) with Local&Remote changes toggle button selected? If so, try to update via popup menu on the files. Any help? If not, attach the messages log after you update (~\.netbeans\version\var\log\messages.log). Then try to update from console: 'cd' to the folder where the new files should appear, check if they are not already there and then run 'svn update'. Do they show up? On show changes only one of the four css files are showing up, but this may have something to do with the previous step with the tree conflicts taking place. On updating the CSS folder via right clicking on CSS-> Subversion->update the new files haven't been added. Checked the show changes once again showing one out of the 4 new css files to have tree conflict. In regards to the committing issue of over 15 minutes that was actually being caused by myself being disconnected from the server for a period while I was dealing with some social media testing. I have since reconnected properly and resolved this issue, please accept my apologies for mentioning this.
Are those files in the same folder? Was the folder already committed? Are you sure that the folder was not added both by you and your peer? That would explain why you got the tree conflict. If you revert your changes, delete the only file that was downloaded, then go to commandline and run 'svn update' followed by 'svn status', what happens?
Created attachment 114172 [details] SVN The folder CSS folder was comitted by myself in the first place and my colleague hadn't comitted anything to that folder until he added about 4 files to the root level of that folder. I have just checked with my colleague, he says that he checkout out the files before committing the new files. I think I have done the step correctly, I have attached a screenshot to this post.
There seems to be clearly a more general problem not related only to NetBeans. If the commandline client cannot update your working copy, neither can NetBeans. Can you try to checkout the project again?
Just created a new blank project and checkout out the file to that Project and the new CSS files seem to be there, so any idea of whats going on?
I just noticed: you ran the subversion commands in commandline while being inside your home dir (C:\Documents..\robert.rosebury). You *must* 'cd' to the root of the working copy (the folder you checkout into), best cd directly to the folder where the new files should appear
Just created a new css file, committed it to my new test project and got my colleague to edit it, add a new another new test file and then committ them both. On my update I have got them, so it seems that something has screwed up on my main project, would you recommend deleting that project & setting up another one??
Created attachment 114187 [details] SVN Screenshot Sorry been a long old day combined with flu medicine. It says the SVN requires an upgrade.
> On my update I have got them, so it seems that something has screwed up on my main project, would you recommend deleting that project & setting up another one?? Yes, i recommend a fresh checkout. You can also send me the local problematic folder with the files and i can check what's wrong.
Okay, I'm going to set it up again, how do I find and send the local problematic folder??
> Okay, I'm going to set it up again > how do I find and send the local problematic folder?? Send me (via email) the folder with .svn and source files that contains the conflicted files. Then delete your whole checkout and do a fresh new in NetBeans (Subversion -> Checkout)
Unfortnately I am unable to send you the folder, as it contains files for the companies website and would get killed by my boss sorry.