After merging current branch to Dev branch and push, PhpStorm shows all project as follow for all project files, it says it doesn't belong to the project and project files in the left menu has a highlighted colour indicating they don't belong to the project.
I already read solutions given in In IntelliJ, How Do I Fix "These Files Do Not Belong to the Project"? and File doesn't belong to this project - PhpStorm but non-works for me.
I also deleted the entire .idea folder and Invalidate/Cache Restart but it doesn't work
Related
In a previous commit we had say folder EXAMPLE1 in the Mercurial repo and had to be deleted due to project configuration issues.
The project has been reorganized and a folder with the same name (EXAMPLE1) needs to be added again.
Mercurial is currently not allowing commit for that specific folder. No errors are shown. However, when commit is attempted, it shows as if nothing has been changed inside the folder.
Would appreciate it if you could please tell me how can the folder labeled as EXAMPLE1 can be added back to the mercurial repo.
I set up a local repo in TortoiseHg and can see the folder in the Repository Registry list. I want to create a central repository that I can push to and pull from when I'm on different computers. I have a Microsoft OneDrive account so I thought I would use that. I did File>Clone Repository... and browsed to OneDrive where I had created a "Mercurial" folder. It apparently did clone the repo since now I see a second repo in the list by the same name but in Bold letters.
I really didn't want to see the central repo in the list. That is only going to cause confusion. At work, we use BitBucket for our central repo and that doesn't show up in the list, so why does the OneDrive repo? Any way to hide it?
Right-click the entry in the Repository Registry and select "Remove from Registry".
For some reason PhpStorm won't apply right colours to new, updated, deleted etc. files, neither in the navigation list nor in the tabs. I'm using GIT, PhpStorm 8.0.3 and OSX. As you can see below, all the file names are in white colour although the most of them are new and modified.
I already went through Where to change color for file names in tab row of PhpStorm, Phpstorm Git file colors, File Colors and File Status Highlights so does anyone know what else I should do to activate file name colouring?
EDITOR with new, edited, deleted files.
File before edit
File after edit
VCS 1
VCS 2
GIT status
inanzzz-MBP:sport inanzzz$ git status
On branch form-type-crud
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: src/Football/FrontendBundle/Resources/views/Default/index.html.twig
no changes added to commit (use "git add" and/or "git commit -a")
Your VCS1 screenshot indicates that Git integration is not correctly set for the project. Use the + button on the VCS integration window to tell PhpStorm where the root is.
It should look like this:
Can i shelve some code I've been working on, at work, with TortoiseHG .. go home .. pull/merge/update ... and then UnShelve and continue working at home?
Does TortoiseHG offer this?
At work, I created a new shelve and added all my 'touched' files into the shelve. But when I got home I couldn't find/see the shelve, etc.
The shelf is just a file on the local copy of the repository, so if you are working from another computer you won't see the shelf.
Note: TortoiseHg's implementation is just to create a diff in the file .hg\shelve, so potentially you could email the file home and place it in the .hg folder (being careful not to destroy an existing shelf of course!)
MQ with pull|push including mq-patches maybe more natural way
In Windows, you can automatically sync shelves using a cloud storage sync service like DropBox or Google Drive. Move the shelves directory (in .hg) to your cloud storage folder and replace it with a directory junction. You can create a directory junction by running this in the .hg directory:
mklink /h shelves C:/Users/<username>/Google Drive/shelves
Of course, replace the target with whatever location you are actually using. Repeat this on all computer you are using Mercurial on.
You can put the files you are working on in DropBox (or similar) shared folder.
In this way you will always have synchronized copy of your file on several computers.
Maybe this is not the cleanest solution but it works.
I have a project, which is in the Mercurial repository. In the root folder there is a .hgignore file, which states, that the "Bin" folder should be ignored (and also some other files and folders).
Now I want to clone this repository but in a way, that ALL folders and files should be cloned, also the original ignored ones. If I just clone the repository, than I get only the files, which are included in the repository thus my bin folder is missing.
How can I get cloned repository with all files in it? I want to merge these two repositories together in a while...
PS - I am working on a legacy application which has a lot of external dll-s in the bin folder of the application. I know I should put them to a seperate folder, but that's another story.
Just copy it.
Copy the whole tree from point a to point b, and the new copy will function perfectly as a repository. The only thing that would be different from a clone is the lack of hardlinks and that the default pull/push path will be set-up to be the same as the original, rather than pointing to the original. That's easy to change by editing .hg/hgrc if you want to.
An ignored file is not in your repository, so it will not be cloned. You should copy these files by hand after you have cloned the repository.
When you copy those files, I think it won't be a problem if you overwrite other files that are in your repository (they're essentially the same files after all), so as long as you don't copy the .hg folder in the root of your checkout, you'll probably be fine.