Some time ago I recall seeing an early release video demonstration of a tool that allowed one to (from within Visual Studio) inspect the history of a section of code.
For example, right click on a method and choose 'view history', and see when that method has changed.
Can anyone recall what product this may have been?
I don't recall that, but is Annotate something that helps you too. Annotate shows a copy of the source file and for each section who last modified it and when that happened.
http://msdn.microsoft.com/en-us/library/bb385979.aspx
What you're looking for is "method history" and we've just released it for Subversion and of course for Plastic SCM.
I think you meant SemanticMerge: http://www.semanticmerge.com/
Related
There don't appear to be any useful options here to resolve this merge from dev -> main branches. Why? I just want to overwrite whoever changed the main branch incorrectly, but I don't have any option to do that here.
If I right click, I see some options but none of them are useful:
EDIT:
Microsoft released a fix for this issue, you need to install the recent release from: https://visualstudio.microsoft.com/downloads.
It's a known issue in Visual Studio 2019, you can read the thread here.
The official Microsoft solution is:
We have identified the problem and are preparing a fix. Until the fix
can be released, here are a few potential workarounds that may help
unblock you.
Launch TFVC operations that may trigger conflict resolution (ex: Get Latest) from Source Control Explorer rather than Solution
Explorer. In our testing, the bug repros less frequently from Source
Control Explorer entrypoints.
Try disabling the "Optimize rendering for screens with different pixel densities" option in Tools->Options->Environment->General.
Another workaround you can try is:
Inside the "Developer Command Prompt for VS2019", type the command:
tf resolve
This will open (from what it looks like) the same window as the one within VS2019, without styling, but the Merge buttons will are present and usable.
When you are done resolving the conflicts in this window, close it and refresh the merge conflict window inside VS2019 to ensure that VS sees the changes.
Disabling the "Optimize rendering for screens with different pixel densities" option works for me, though I'll note that another coworker here with the same exact version doesn't have that option.
in the next version the bug is fixed ,update your version of vs,
OR
go to =>
Tools/options/environment/General/
Disabling the "Optimize rendering for screens with different pixel densities"
and this is fixed.
I started using Netbeans (8.2) a few weeks ago and the search utility is driving me insane. Basically, I search for a class/file name in the top-right corner and it returns with no results, when in fact the class/file exists in the project. The same thing if I do cmd+O (go to type). This does not happen every time, but it happens a lot. Is this a bug? If not, can anyone enlighten me what I'm missing? Thank you in advance.
Yes, I've faced that nasty bug too. It was reported previously (few times) and then closed, but problem remains even in 8.2. It looks like they messed up with index, or cache, or both. I've ended up writing my own search plugin using independent index db. It is called "Quick File Search" and among other features provides button to rebuild it's index (in settings). Also exposing regexp and allow you to automatically add extensions (if you need it).
Disclaimer: yes, I am the author of that plugin.
In my understanding the search box allows you to search everything that you selected (You can change the selection in the icon).
In a simplistic way, the "go to type" refers to files that are related to the code (class files). If you want to go to other type of files you have to choose the "go to file".
So for example if you have a class called Status.java and a file called status.xhtml.
You could get both files with "go to file" (Alt+Shift+O in Linux).
If what you want is only the class then you could use "go to type" (Ctrl+O in Linux)
Before I understood the difference I had some trouble finding files because I only used the go to type which only returned classes.
Netbeans has a limit. If the keyword you are looking for is found 5000 times in some file (mostly say log files), it won't search on other files.
So delete the logs file and you will get to see application files in search results.
Hope that helps.
Has anyone used the old P4SCC plugin with VS 2012, and stumbled upon automatic check out not working? If so, have you resolved it?
I've made sure that the source control is up and running and that in Tools-Options-Source Control-Environment-On Save the "Check out automatically" is selected.
Still, every time I save a modified file, it shows the Save As dialog. Frustrating...
I don't know if it's related to your specific problem, but my automatic check out failed as well the same way you describe (with TFS without P4SCC).
In my case, the problem was that the solution happen to be offline. Right-click on the solution name (at Solution Explorer) -> "Go Online" and the issue was resolved!
Conventional wisdom says to delete code once you don't need it -- as opposed to leaving it in the codebase as a comment -- because you can always find it later in the repository.
Let's say I need a line of code from the past which I remember to contain a very memorable substring ("XYZ", for discussion's sake).
What are my options for finding the previously deleted code using the Visual Studio 2010 Rational Team Concert (3.x) client? Can I search only the revisions of a single file (I might not know what file it was in)? Can I search quickly/easily across many files (w/o pulling those files out of the repository)?
I am not sure there is an easy way to get back the exact file with that missing string.
You can select show the history on a component of a Stream, in order to "Show the History files" for a given change set.
From there, you can do some "compare with Local File".
However, the Visual Studio integration might be less complete than the eclipse one, as this thread shows (where the "Show History" shows only the history of Deliver's).
Even though the following article uses the Eclipse GUI, have also a look at "Practicing source control archaeology with Rational Team Concert", which has other ideas for you to try.
It seems whenever I compare via the SVN Repository explorer (most recently after a merge) subclipse will show a few files in the compare window that have no differences whatsoever. Double clicking the file brings up the Java Source Compare window, but Subclipse highlights no sections and shows no differences. A manual inspection of the file shows they are identical. What causes this? Are there any ways to disable it, it can be quite confusing?
Your help is greatly appreciated!
Sounds like it could be whitespace-related. Maybe tortoise defaults to ignoring ws changes.
Seems to be Eclipse bug, which waits for solution...
https://bugs.eclipse.org/bugs/show_bug.cgi?id=318826
There may not be structural change, but only space related or formatting. Try clicking on "next difference".
I think the problem is that after merging the revision of the file is changed. So, although the content of files is the same, the compare view shows the change. It is very very bad... :(