Recently I switched from Eclipse Kepler to Eclipse Luna.
In Kepler when I opened Team > Switch To... I only saw open/ active branches.
Now in Luna when I open this dialog I see ALL branches that were ever created in this repository. And that is a lot :(
Also, when I switch to our "default"-branch it says "24 heads" because two years ago there was an incident and someone created that many heads for this branch. The heads are long closed, but my Eclipse-Mercurial-plugin doesn't care. I still thinks that those heads exist, because it ignores the "closed" status of the branches.
I already checked the Preferences and I found no possibility to change the setting for that. Besides, the settings are identical to my Kepler-installation. Also, I have the same Mercurial-plugin ("MercurialEclipse project", 2.1.0.201304290948, com.vectrace.MercurialEclipse) installed in Kepler and Luna.
(my OS is Xubuntu 14.10)
Can anyone help?
Hm, there wasn't really a solution for this :) But I want at least to describe what happened.
I was the only one in our team who had that problem. We found out, that when we use our existing workspaces we had no problems. When we did a completely new check-out into a fresh workspace from our Mercurial-server, we had all the problem described above. (That's the reason I was the only one with the problem: When switching the Eclipse-versions I also decided to start a fresh workspace) So we dug further and found out that all branches we had once marked as "closed" had lost this marker. So that's why they all appeared when I opened the switch-to-dialog: the dialog showed correctly all non-closed branches.
We don't know how this could have happened. No one opened all branches on purpose. Perhaps a Mercurial-bug? And the fact that it didn't affect existing check-out made it even more strange.
The short-term solution: I copied an existing workspace from a colleague and happily continued programming.
But we knew that it would be a problem for anyone who would join our project in future.
So we just switched to git :)
We were already discussing this for months, like: should we switch? shouldn't we switch? weighting pros and cons. So this bug seemed to be the perfect reason and opportunity to do the switch.
conclusion:
It wasn't an Eclipse-bug, but a Mercurial-bug. And the solution was git :D
Related
I am creating successfully a subtree to a remote repo and pull/push successfully using Sourcetree. The substree repo appears below "Stashes" tab on the left of Sourcetree as "Subtree" tab.
However, when I close and reopen the Sourcetree, the "Subtree" tab and the subtree that I have defined earlier, disappears.
It does not disappear, if I close the project tab and reopen the project without closing the Sourcetree.
I have seen these two post with the same/similar problem:
First Post
Second Post
Both links belong to the same person.
I have tried the suggested solution there (clearing cache) but it did not solve my problem.
The person, who was in charge of developing this part of the Sourcetree, has not posted since 2017. Maybe he left Atlassian, and this issue is still there.
I have already asked this question in the Sourcetree forum, but no replies since April.
I have opened a bug report at this link
I have tried version 3.3.9 and the problem is still there.
It seems to be a simple "save" issue. I also remember that Sourcetree did not have this issue in the earlier versions.
I found out that this is consequence of another major issue with Sourcetree versions came after 3.2.6. After this version, a major bug is introduced, probably something related to authentication, and it results a constant red exclamation mark on the remote button. This mark can be fixed in version 3.2.6, but not in the later versions. So, I am staying with version 3.2.6 for now.
We recently have moved from SVN to GIT, and until recently, the problems with the move were if not minimal, at least manageable.
Until a few weeks ago, we just had a single active 'master' branch, which was the old SVN trunk. But then, we added a branch to do a major upgrade while keeping the master available for bugfixes that could then be easily deployed.
The problem is that as soon as the different project team members started to check stuff in, the Eclipse (Mars 2 with EGit) Team Synchronization perspective started showing stuff as needing to check in that really didnt.
The first time I synchronized, a load of incoming changes came in (the blue arrow) which was unusual as I hadn't seen any since moving to GIT, - we just had to do a PULL instead - so foolishly I accepted them in. That ended up merging the changes we had put in the trunk with the branch, which we DIDN'T want to do.
Worse, even after pulling in those changes, they still appeared but now as conflicts, even though I accepted them and the files were identical. Nothing I can do (Mark as Merged, Overwrite, Commit...) gets rid of them.
Anyway, the most unhelpful problem is that now the Team Synchronization brings in hundreds (currently 825!) supposed changed files when I do a synchronize now. Many of these files are obscure ones that havent changed in years, and are clearly unchanged yet they show up. Trying to sift through the file list to find what I have actually changed is too much effort, especially as Eclipse helpfully refreshes the list with all the items I removed from the view each time I make any change!
So basically now I am resorting to GitKraken, which has substandard diff tools but at least shows an accurate view of what needs checking in. Why they decided on the Duplo-sized fonts that take up so much window space in the staging area I have no idea. And it's SLOW.
I now have a healthy dislike for GIT because its such a faff compared to SVN, although I acknowledge a lot of this is down to the GIT implementation in eclipse.
So, does anyone have any tips about how to get Eclipse to recognize that most of these files shouldn't actually be displayed? Am I missing some configuration somewhere? When I right click on the project in eclipse and do Team > Switch To, it correctly shows the branch Im working on, so why is it so inaccurate? Im using Eclipse Mars2 4.5.2 with JGit 4.6.1
Any tips appreciated.
For anyone else having similar problems with this, I sort of have an answer.
My answer is, that Im not sure what got it working, but my team synchronizing perspective now shows 99% the correct view. I clicked on various things with increasing desperation to get this to work and then some combination of the below in the Team Synchronizing perspective had the right effect:
In the Synchronize tab, select the down arrow next to the view type and select either Java Workspace (for the master) or Git Commits (for the branch)
Click the down arrow next to the Synchronize icon at the far left, select Synchronize and then Git, then select the correct destination (eg ref/heads/master) and then clic on 'Include local uncommitted changes in comparison'
Hopefully thats of help to someone.
I think I am just merely (coming from an SVN background) confused with how Git conflicts are handled by EGit within Eclipse.
I understand that it shows textually in the normal standard method by which to show conflicts as stated here: http://www.kernel.org/pub/software/scm/git/docs/git-merge.html#_how_conflicts_are_presented however it isn't very clean and with thousands of lines of code it becomes unmanageable to avoid accidently deleting lines that are not meant to be deleted.
Is there any GUI within EGit that can show me each conflict with an step over ability?
I have searched around and I heard about the merge tool however when I follow the instructions by right clicking on the top level node of the tree (i.e. right click models folder that has the <> type icon denoting a conflict, which has a conflicted file of User.php within it) the merge tool is greyed out.
Am I using the merge tool wrong?
Edit
I found out that a bug can cause EGit merge tool to not show: Why is the merge tool disabled in Eclipse for a EGit-managed project? however I am using EGit 1.3.0 so I should be way past this bug.
I have given this question two days both here and on the EGit forums: http://www.eclipse.org/forums/index.php/t/371459/ unfortunately (even after everyone viewed it) no one had a real answer so I decided to solve my conflicts manually and just merge that way.
This way was, in reality, quicker and easier than trying to solve why the merge tools were not working for me, ironically.
Every time I change a package name or move some source code folder, I get "out of date" errors when trying to commit on SVN with Subclipse (plugin for Eclipse). It's amazingly annoying and I always have to spend additional 20 minutes trying to think of a solution how to solve that. Does anyone have similar problems? How do you solve them? Is there a way to force commit something (to say to commit and not pay attention to non-updated files)?
I have similar problem. Unfortunately I have not found out the reason.At first I thought this happens because of incorrect commit order for packages, subpackages and classes. It seems the problem occurs only for projects with more then one developer involved. I always do Update after deleting any package and before commit. This always helps me.
when i startup eclipse, first thing i usually do is updating my source code to pull in changes from other developers (or from my home work). Sometimes i just forget it. But as we are usually working in a small team on HEAD, we all usually want to have the latest sources.
It would be nice to let eclipse automatically (like every hour or so), synchronize its workspace with CVS server and mark the project with a label for pending updates (of course it shoul dnot update the source code automatically!)
I have searched the web for it and i found some comments on CVS watch/edit feature. But i don't like to call edit every time i work on a file and i don't want to be informed by mail. All i need is a little icon at my project which says "You might run cvs update before you work on".
Is something like this available as a feature in eclipse?
regards
Janning
Well, what you're asking for is precisely what the CVS watch/edit feature is for. I agree that the emailing issue is a major PiTA but hey - remember - CVS is quite old; many CVS concepts appear a bit odd nowadays, whereas they appeared more reasonable when CVS was first written.
I cannot think of any internal, Eclipse-provided way to do what you're asking. You basically need the "Synchronize" view to be updated periodically - and, the way that the CVS plugins are written - that view is only populated upon startup and whenever you select "synchronize with repository".
Isaac