Today I faced with a problem: cannot commit my local Android projects changes to svn.
Team -> Update and Team-> Clean Up didn't help me.
I don't get any messages. I click commit and see Show History -> my changes are not committed.
Thanks in advance.
You should probably get a hint by looking at the svn-console, and showing us what you get there: A random google-image to find the console:
http://www.eclipse.org/subversive/documentation/images/svn_console.png
If you have that console (should be on the bottom of your screen, otherwise try and find it with the window->show-view menu), but it's not showing anything SVN-related, you can press the button just left of the "minimize" button: It will give you some options ('new console view', 'java stack trace' and hopefully 'svn').
Related
I am using Eclipse (Photon 4.8.0) for a Git project. Before committing, I have been double clicking the files which appear in the unstaged changes section of the Git Staging View to remind myself of what I have changed before writing the commit message (I'm still new to Git so occasionally I will do several things before remembering that I have to commit my changes). However, double clicking on the file today merely opens the file, rather than opening the comparison view. I can still open the comparison view by right clicking the file and selecting Compare with Index but this takes more time and is frustrating.
As far as I know, I haven't changed any settings (not intentionally anyway). Can someone explain to me how to get back the behaviour I was seeing before please?
Make sure, in the Git Staging view toolbar the Compare Mode button is pressed.
See also EGit User Guide of the History view with the same icon.
I want to commit my works. But when I want to see what I changed and wrote them into commit message, I saw some of my changes won't show.
What is the problem?
Change The Maximum Lines And Size In Options
Tools > Options > Diff
Change Max Diff Line Count
And
Change Size Limit (Text)
I'm adding this answer as another possible cause of SourceTree "only showing the change history for a single file". This was annoying me for quite a while. No settings changes would display more than one file. THEN, I realised that the commit summary is actually a panel which slides up over the file list. ZOMG.
Make sure your filter is setup correctly:
For me the filter bugged out and while the main text said "Pending files", the dropdown had nothing selected.
Size Update For the latest ScourceTree
ScourceTree -> Preferences -> Diff -> Size limit(text)
Make sure that you copy the last version of your project, the one that you want to commit, to the directory of your repositories that you set for SourceTree. Replace the old project with the new one then open SourceTree
Open SourceTree, click commit, select all the files that you want to commit, which will probably be all the files you see (becuase SourceTree shows the changed files after you click commit).
On the Puush button on the top you'll se a red notification icon which means that you didn't push the last commit. Once you do that, your changes must be visible on BitBucket and SourceTree
Another possible reason:
Make sure Ignore whitespace in the diff view is not enabled.
If it is not a Pending issue or an options issue mentioned above, make sure Mercurial wasn't inadvertently checked if you're using it with Git. It will manifest in a similar way. If so, you're going to need to deinstall & re-install.
Go back in time in the codebase and see the commits as an animated explanation of how the codebase was formed. a great way to get into a open source project?
For insance if you could play this inside Eclipse, so that the comments the time and the reason for the commit become clear.
Is there such a thing?
A static (i.e. non-animated) version of "going back in time" is EGit blame (annotations):
Selecting the Team > Show Annotations action on file selections will open the editor and display an annotation ruler with commit and author information for each line in a file.
Hovering over the ruler will display a pop-up showing the commit id, author, committer, and the commit message.
I accidently messed up the default eclipse layout now I can't get it back the way it used to be. HERE is a picture. What really annoys me is that eclipse now is taking up unnecessary space at the top. What I want gone, but can't get rid of is the bar all the to the right with "Java" in it. Right clicking won't help at all. Second, I want to get rid of the bar left to this "Java"-bar. As you can see it doesn't really have ANY FUNCTIONALITY AT ALL(??). To get rid of this strange bar is the most important thing since this will move up "Java" and Quicksearch to the placement above.
Edit: Just so to be clarify, THIS bar is what I mean which woul solve everything.
Actually, the most helpful thing would be to restore the whole Eclipse layout to default. I have tried Window->Restore Perspective but it doesn't help me :(
Thanks!
right mouse click on the perspective(top-right "Java") and select Reset. This will fix the perspective.
EDIT: It seems to be a bug in Eclipse Juno. A suggestion is to delete the workbench.xmi file, but it doesn't work for everybody...
So If it doesnt work, you have to install your eclipse again.
There are different things you might try:
You should be able to drag and drop the bar to a location where it
automatically docks and does not disturb you (e.g. at the bottom)
Right click the emtpy bar and choose "hide toolbar"
If everything fails: Delete your eclipse installation and load a new one. Don't delete your workspace and point the new installation to your current workspace. You will have all your projects as they are now.
As a workaround, until this bug will be resolved, you can edit eclipse\plugins\org.eclipse.platform_4.2.1.v201209141800\css\e4_classic_winxp.css.
Append following code.
.MToolBar.Draggable {
handle-image: url(./winXPHandle.png);
}
.MToolControl.Draggable {
handle-image: url(./winXPHandle.png);
}
Source: https://bugs.eclipse.org/bugs/show_bug.cgi?id=389594#c4
I had to click on reset for all my perspectives, then exit eclipse, and re-open it. Worked for me.
How do I resolve conflicts in TFS?
I must have forgotten to do a recursive get before editing a file. Whatever the cause is, I must now figure out how to resolve a conflict.
When I click on the workspace to performa check-in. One of the files as a two-way pointing arrow which I guess must mean there is a conflect.
When I click to perform a "Check In" a message box appears that tells me:
"No files checked in due to conflicting changes. Please use Conflicts Channel to resolve conflicts and try again".
So I googled "Conflicts Channel TFS" and I got some results but all of the results only gave suggestions, like, Click on "Automatic Resolve". The problem is that I do not see any of the menu commands or buttons to ckick on that they suggest.
Try getting latest on the file. That should trigger the conflict resolution screen.
Open the View menu in Visual Studio from the main tool bar. Scroll down to 'Other Windows', then open the 'Pending Changes' window.
On the right side of this Pending Changes window, there are 5 Buttons, each with an icon. The 5th one down is the Conflicts button. This will show you all the conflicts and will allow you to resolve them here.