When I change some interface things in Java, like the contents of a menu item, and save them, the commit option does not enable. NetBeans does not know that changes have been produced so I cannot commit them. How can I commit them?
Can you commit from the console?
try svn stat in the root directory of your project, that should show you the files that have been modified with an M near the name of the file. if you can see them, run svn ci to commit all changes.
Maybe (and just maybe), svn is ignoring those files on purpose, to check if this is true, run from the console svn propedit svn:ignore .(<- this dot is necesary) in your project root to check if that directory/file/file extension is being ignored.
Good luck!
Are you using Netbeans 6 or higher? If not, you need to tell Netbeans where the svn executable is (see the link and the associated FAQ).
Are you sure that your subversion repository is running on a machine that is in sync with your workstation's view of the current time (e.g., synch-ed via ntp)? If the time is enough out of sync, it's possible that the subversion module is missing the update and, therefore, not flagging the change.
Also, you should check to make sure that you have an active valid connection to the subversion repository. You can easily do this for the file you just edited: right click on the editor tab for that file and choose Subversion -> Diff or Show Changes or Search History. If any of those fail, your IDE has lost its connection to SVN for some reason.
Another possibility is that you didn't succeed with a real checkout: if the .svn subdirectories aren't properly configured, the menu item will definitely be disabled. I would recommend that you right click on the project (under Projects) and try Show Changes. If that doesn't succeed, you don't have a valid Subversion checkout and the Netbeans options definitely won't work.
If for whatever reason netbeans isn't allowing you to commit, I would suggest either doing it from the commandline, or using a program like TortoiseSVN
It is Subversion's responsibility to know what has changed since the last commit/update. If NetBeans' Subversion interface doesn't allow to commit, then it may be a bug in Netbeans. Technically, there should be no reason to disable commit button - Subversion doesn't prevent you from committing even if nothing has been changed.
Right Click the file which is marked as red color, select resolve confilcts
and try to commit now...
Related
In IntelliJ IDEA is there a way to highlight the files changed on a current branch (i.e. all files changed in your previous commits) in the project section?
Obviously the git/history tab can be used to see the files but it is pretty cumbersome as it opens the diff instead of the actual file.
It's nice to just be able to quickly see the files you've been working with show up a different colour. I usually hold off on committing my changes until I'm nearly finished on something just so I can easily see the files I've been working with recently.
See whether this works for you.
Open Git history, click one of the commit, then on the right page, right click and select "Edit Source", it will open all the files that were changed/updated/added on the Tab editor.
In IntelliJ IDEA is there a way to highlight the files changed on a current branch (i.e. all files changed in your previous commits) in the project section?
Currently, there is no option to set scope in Local Changes to a particular branch, please see and feel free to vote:
https://youtrack.jetbrains.com/issue/IDEA-161465
I tried to use the "shelf" feature for the first time in IntelliJ IDEA today. I shelved all my current changes so that I could work on a quick bugfix, commit it, and come back to my current work afterwards.
When I commited the "shelf" action, IntelliJ created the shelf and I could see it in the tool window. Then it reverted, and reloaded the project.
Now the shelf tab in the Changes tool window does not appear any more.
However in the file system I can see the patch file under .idea/shelf.
Why ? I suspect the problem is that the .idea directory is itself under version control. So when I shelved the changes, it file was included in the shelved changes, and then it was reverted, and IntelliJ is not aware of the shelved changes any more.
I am using Git.
How can I make IntelliJ aware of the patch file in the change tool window ? Or if impossible how can I restore these changes based on the patch file only ?
And how to use this feature in the future without encountering this problem ?
Is it a bad practice to keep the .idea directory in te VCS ?
The answer to the
How can I make IntelliJ aware of the patch file in the change tool
window ?
question was :
Create a bogus shelved change so that the "shelf" tab is available. It will not show if there are currently no shelved changes.
Right click in the "shelf" tab, select "import patch file", pick the previously create patch file. This creates the "shelf"
You can now "unshelf" the changes normally
Finally, I had to manually merge the workspace.xml file. After this, I think I will think about stopping to commit IDE project files to VCS. At least when it is a trivial task to recreate the IDE project from e.g. a checked out Maven project.
If you are ever lose the Shelf tab in a Jetbrains IDE, you may have shelved too large of a file (a 1.81 GB .patch in my case). You can view all of your patches in the Jetbrains shelf by going to:
/.idea/shelf
Delete the really large patch file and restart the IDEA and the Shelf tab reappears on the Git area .
If you don't see your .idea folder in your IDE, follow these steps:
Help > Find Action...
Search "Registry" and click the found action
In the Registry search "dot.idea" and uncheck the checkbox in the Value column for the projectView.hide.dot.idea Key
I had similar issues, but shelving bogus changes did not help (was using WebStorm, but the underlaying IDE is the same). The shelf window did not show up no matter what I did. Even though the shelved changes were created in the .idea/shelf folder. What actually in the end helped was moving/deleting .idea folder under the project completely (good to backup before deletion). And restarting JetBrains IDE.
For anyone (like me) still running into this issue:
The shelf tab is most likely there, but not displayed due to the width of the commit tab.
In the top right of the commit tab there are 3 icons:
arrow down
cogwheel
minimize
On the ARROW DOWN you see all the "hidden" tabs, which includes the tab "Shelf" for me.
Or you make the commit tab wider then you should also see the tabs at the top.
When my partner attempts to commit his update to BitBucket, he comes across the following error:
Repository State: Conflicts
The IDE does not tell us any further details about the conflicts and does not mark any issues in his code.
What is going on and how can we fix this?
If you do not have any uncommitted change then do a hard reset from Team > reset > (select Hard option)
do a pull request again. find all the conflicted file(file with red diamond icon) Resolve any conflict (manually edit the file, or use merge tool),
then right click on all(one by one ) conflicting files, select "team", then select "Add to Index".
(if every conflict is resolve then there should not be any conflict(red diamond) icon. before trying to commit anything make sure all the conflict is revolved)
now you should be able to commit to git again
I am not exactly sure what is causing the conflict, but your partner should be able to see which files are conflicting by looking for a red diamond inside the Package Explorer. Resolve any conflict (manually edit the file, or use merge tool), then right click on all conflicting files, select "team", then select "Add to Index". After that, your partner should be able to commit to git again.
I hope this helps!
I know this is an old post but I ran into this problem yesterday. I had this Repository State: Conflicts message when I was trying to commit after removing all the conflicts. As I couldn't see anything wrong in Eclipse, I opened GitHub Desktop and it did show me straight away what was wrong. I work on MacOS X and there was a .DS_Store file in the workspace. This was the file where the conflict was. Eclipse wouldn't show it but thanks to GitHub Desktop, I managed to remove the conflict and then I could commit my changes in Eclipse. I hope it helps.
Sometimes there are files in projects that are not shown by IDEs. You should use git console commands like "git status" to check for those files, manually merge and add them by "git add filename". When all the conficting files are completed, you can commit again.
In my case there is a .gitattributes file which is not visible to eclipse since it's not in any of the eclipse projects. It also had conflicts and was preventing the merge from being resolved. I had to do that one outside of eclipse and then do a refresh in eclipse.
I'm trying to share a project between my desktop and laptop using Subversion. The project has 3 modules. I've imported the project folder into a repository in a shared folder that my laptop can access over the network.
I checked the project out on my laptop and then tried to open the project. None of the modules are visible, only the project's .iml file, as in the screenshot below.
I notice that the .iml file has a line for "content url", which refers to a location on my desktop. Maybe this is the problem. What can I do about it? Do I have to create a new project on the laptop and import the modules - so there would be 2 different top level .iml files, one for the desktop and one for the laptop? Am I going about this the wrong way?
UPDATE: The problem seems to be with committing. When I make a change in a file, save, and hit Commit Changes, I get a popup saying "No changes detected". This is the same on both laptop and desktop, and meant that I downloaded the wrong version onto my laptop before. I deleted the repository and created a new one, and my project works on my laptop now, but I can't commit changes from within IntelliJ (only with TortoiseSVN via file manager). Also, when I imported my project into version control from my desktop computer, the working copy wasn't put under version control. So I can't update from my desktop unless I check it out to a different folder.
I think there is something wrong with the SVN plugin with this version of IntelliJ (10.5.1). Does anyone else have problems with committing changes?
RESOLUTION I needed to
1) Update Settings | Version Control to map Subversion to the working directory
2) Import into Version Control
3) Check it out again
It may possibly have been caused by the fact that the modules were originally standalone projects which were in separate repositories. Whatever the cause, IntelliJ's "No changes detected" dialog isn't the most helpful.
VCS -> Refresh File Status solved this for me, when Intellij suddenly stopped noticing changes.
Please refer to the FAQ.
As for the content root, make sure that it's located under the project root or module root, in this case the path will be stored relatively to the project/modile root inside the iml file. If the fixed system specific path is used in the iml, such module will not work on other systems.
UPDATE:
Make an explicit mapping between the actual working directory and Subversion in Settings | Version Control dialog. If you are using the default placeholder and your project files are not under the checkout root, it could be the case.
After performing the initial import you need to do a checkout in order to use version control in IDEA.
Sometimes doing VCS -> Refresh File Status works for me.
Other times, it does nothing.
A solution is to
COPY all your file contents to clipboard / external notepad (for backup)
Choose Rollback on the file which needs updating. Now it is up-to-date with the server and does not contain your new changes.
Edit file again (checkout), and PASTE your original file contents.
Attempt to commit changes. It should detect them now.
I just ran into this today- checked out an existing project and had to update the SVN scheme from 1.6 (I think) to 1.8. That seemed to make Subversion not recognize that it was wrong it its belief- even though I could DIFF and see changes relative to the latest repository version- that "No Changes Detected."
I got so fed up that I shut down Intellij...on a whim I reopened it, and the file in question appeared blue...hmmm...yep, now it detected the changes.
I had the same issue it seems it may have been caused by having a file with the same name in two different GIT-repositories.
I was able to fix it by opening File -> Settings -> Version Control and then un-assigning and re-assigning GIT as the VCS of the two directories which both had the file. First the directory in which there was no changes in the file then the other active one which did have changes (but which did not detect them before).
I got into the similar issue today and I tried VCS -> Refresh File Status, but it didn't help me. When i looked at Version Control->Subversion Working Copies Information, i found an svn error The working copy at /home/project is too old to work with svn client 1.9.4. First i ran svn upgrade and then doing VCS -> Refresh File Status resolved my issue and i was able to commit my changes.
None of the other solutions here helped me.
Ended up checking out the entire repository again, copied all the sub folders over to the newly checked out folder and submitted the changes.
Deleted the old folder and renamed the new folder to the old folders name.
Is there a way in Eclipse to view all recent changes of a project? Like in SVN, you can just go "view log" on a right-click menu of a folder. In CVS/Eclipse, I can only view history on a certain file. I am not able to see what files were changed in the last commit. >.<''
Thank you!
You could do diff based on time. See what changes have been committed during last couple days, for example.
It's rather awkward in Eclipse, but you can go into CVS Repositories view, click "Dates", enter the "from" date, and then navigate to project you want to find changes, choose "Compare With" and choose "to" date. And then you will see changes that happened during that time.
I don't think it's supported through the standard Eclipse plugin.
There was a sourceforge project that tried to augment this functionality, not sure if it's still actively being maintained.
I don't find nothing insiede the tool in Eclipse. I prefer to use CommitMonitor to monitor SVN History of project (entire project, branch/s, tag/s). It runs in systemtray and advert you every seconds.
As mentioned in this thread or in the CVS FAQ:
"see what files were changed in the last commit":
Would that not be the equivalent of selecting the "Compare With>Another Branch or Version" operation from the context menu of the project ?
Until I don't have plugin that can do the job from Eclipse, I use file history from the ROOT of the repository.
If You not see file history in ROOT then create it with
REPOSITORY_HOME\CVSROOT>echo>history
After that all actions on the repository will be saved in form:
u4f2c09af|dejanr|MyPC|src|1.5|Main.java|
Note:all users need to have rw rights to 'history' file
right click on project team->synchronize repository
Doing this turned out surprisingly simple for me:
In SVN Repositories view, right click any directory, including repository root
Pick Show history from the context menu
Revisions will be shown in the History view, like Show log in Tortois