I've been using Mercurial for more than a year. Now, I added a new .Net project to it. I chose to ignore all the BIN / OBJ folders in the Solution folder and everything went well. I used masks to ignore entire folders or the right click -> Ignore command to ignore particular files.
Now, all of the sudden, I can't see the Ignore command any more! Normally, it should appear upon right-clicking a file. It doesn't. I also tried ignoring the file manually by adding this line in the .hgignore file:
Client/eTimeKeepLoading.png
But all that did was to (as you can see in the image below) mark my .hgignore file for commit, but the damn PNG file is still in the list. What's wrong with this guy? ::- D.
It's an already-added file. Ignoring only hides files that aren't yet tracked by Mercurial (and you can explicitly hg add ignored files if you want). Just revert it, and it'll be hidden.
Related
I know this seems really obvious question but I have gone through a lot of different git ignore files but still I am unable to control this one file.
What is the issue?
How it occurred?
I just changed the one view controller's position in the storyboard.
What I need?
Any possible way to add this file into git ignore so that I can avoid these simple merge conflicts? Also, I cannot add this storyboard into git ignore because I want to reflect the changes in View Controllers which I actually made. On my previous macbook, it was working fine, no idea why the same git ignore is not working anymore?
Because it's showing "Changes not staged for commit" rather than something about untracked files, what this means is that you have Main.storyboard already being tracked by Git. In other words, as soon as you add a file to Git and commit it, that file becomes tracked, meaning that Git will be monitoring it for changes.
.gitignore does not work for tracked files, but rather only untracked files. You can use
git rm --cached Nava/UI/Base.lproj/Main.storyboard
to remove it from the index, and then commit that. Now, if you have the .gitignore file properly set up to ignore that file, you won't see it coming up anymore.
Eclipse shows me with the symbol > which files I have modified, after the last repository update. Before commiting, I want to see the changes I made.
When I go right click->Team->Synchronize with repository I get exactly what I want. The problem is, I only get the view for this one file I clicked. I need to change the view back to Java, to be able to chose the next modified file.
Is it possible, to compare all modified files, one by one, with the latest edition from the repository, without changing the view after each file?
Instead of right clicking a specific file, you can right click the entire project and perform the same operation you describe.
I hid some files of a SVN repo by using the 'Remove from view' option. It's stated that they would show again in case of modification.
http://imgur.com/HEPRcF8
But now, Eclipse shows conflicts in my project, with absolutely 0 files with conflict.
http://imgur.com/2ZCOnwS
I'm thinking that it might be one of those files, but I can't find any way to show them again. So:
Is there a way to reset the repo view in Eclipse?
Is there another way to see where the conflict stated by Eclipse is coming from? When I use the svn command line, I don't see any conflict..
According to the Eclipse doc the file should reappear in the View if its conflicted:
Remove from View - removes the selected resource from the view. It
will reappear in the view if it's synchronization status changes.
File being in conflict should be considered as "synchronization status change", so I think that the removed-from-view file is not the conflicted one. I guess that you have a tree conflict in your working copy.
To determine the conflicted item, run the following command-line against your working copy:
svn status -q
The output of the command will show conflicted items only.
I am using Eclipse JUNO with the subclipse plugin.
Generally it works quite well. To commit files to the SVN repository you synchronize to check the changes you have made. Select the files you want to commit, add a comment and simply commit it.
Usually the selected files are then properly committed.
However, sometimes the selected files view in the commit window do not correspond to the actually selected files in the synchronize view. Instead it simply indicates all files in the project's file directory.
If you don't notice and commit you end up committing dozens of files/directories you do not want or need to commit.
I have tried all sorts of things to try and make it do that so that I know which chain of actions triggers it so I can avoid it but of course it never does it when you try.
Does anyone have any suggestions as to what might be causing it or experienced the same? It is definitely not that the selected files are no longer selected. I could clearly see that selection still being active on the left hand side synchronization view but still the commit window was showing a full file selection.
Any help/suggestion much appreciated.
I finally figured it out. Whatever file selection you do is overridden by a folder selection at a higher level => if you accidentally mark the project's main folder all files are transferred.
In the end it is Very simple and logical. The only nuisance is that the specific files you selected at a lower level are highlighted in the commit window's file selection view as well so if you look at the view superficially you get the impression only your selected files will be committed.
I have problem with derived files. Some of my files in my project are 'derived'.
When I want to edit these files, I get the following message:
"This file is derived"
"Do you really want to edit?"
When I right click on this file and choose properties, I see that "Archived" is marked.
I think this is a problem with Maven, but I don't know how to fix this or know why part of my files are 'derived'.
There isn't necessarily a problem. Derived files are those that are being generated on the basis of other files. And when you edit them, the next time they are generated, your edit is lost.
Try to find which are the source files.
I just had this problem, I accidentally dragged and dropped a package into the gen folder. This set a flag on the package as derived. When I copied back it still existed, and affected all the sub files.
I just right click on package, properties and unticked Derived, and problem solved.
You probably tried to edit file in "target" directory.
i had this problem after creating a LaTeX document with TeXlipse. TeXlipse placed the output (PDF) file in the same folder, and marked the entire folder with Derived attribute. Derived files are those that have been automatically generated and should not be edited or the changes will be lost next time the files are regenerated. Clearly not all the files in the folder were derived. By right clicking on the folder and selecting Properties, I could see that the Derived attribute was set, but unchecking it did not help (next time it was checked again).
If the problem actually is with Maven, then this won't work, but in case somebody is having this problem after creating a TeXlipse document, here's the solution:
Right click on the project, select Properties, then select Latex Project Properties.
Either uncheck Set LaTeX output files as derived, or modify the Output File path so that the file will be written into the project root or into a different folder.
Right click on the folder that has the Derived attribute, select Properties, uncheck Derived.
Derived files are those are in target directory and has been generated for packaging. Take a look and try to edit the good ones
I faced with the same problem during editing Latex documents in TexLipse plugin. Accidentally, I was not able to modify my documents although before this 5 minutes ago I had had this possibility. To overcome the problem I simply deleted the project from the workspace and imported it once again. The checkbox of derived files was not checked.