smartgit is a pretty idiot-safe tool.
@Cas: The issue with Egit (Eclipse’s Git plugin) is that it is not plain git behind the scenes. When doing complex merges, say, there are both unresolved upstream and downstream conflicts, Egit freaks out. You can do a ‘pull’ and it will complain about conflicts or it might simply crash. Going to the commandline and doing the exact same pull, will do the job just fine, often even merging these pesky ‘conflicts’ for you.
Don’t let Egit ruin your impression of git. Egit is a bug ridden, sloppy excuse for a plugin. :persecutioncomplex:
Actually, I have (just?) forgotten to convert the svnignore to gitignore, the rest seems to be working. I did it in command line as I wanted to understand what I was doing.
Indeed, this appears to be the main stumbling block… the Eclipse Git stuff is just unusably incomprehensive. When I look at handy sites like this Git cheat sheet it all seems perfectly sensible. When I try and map the Eclipse UI onto it… total fail
Cas
Funny…I just hit this today:
I can only use git via command line, no big problems when doing simple things. I never understood any visual tool… and Im not really a command line guy either
and yes, I panic at problems, so I do as that xkcd
I also never work in the same folder I do git, and backups too…
Hi
I’ve made a decision. As a first step, I’ll follow one of elect’s suggestions as ublock seems to be a lot less used than AdBlock and AdBlock+, i.e I’ll stay on Sourceforge.net for about one or two months as I have some more urgent tasks to do now.
The second step will consist in redoing the Subversion to Git conversion a bit more cleanly, still on Sourceforge.net. There are more hosting options with Git than with Subversion and anyway, I already use Git on lots of projects. Of course, I’ll do some regular backups.
The third step will consist in having a first mirror of this Git repository either on the JogAmp development repository or on Github as Riven suggested. It’s just a security in case something goes wrong later. It shouldn’t take me long.
The fourth step will consist in installing Debian, an Apache HTTP server with a few modules (explained in this simple tutorial) and Gitalist as a Git web viewer on a Raspberry Pi 2 until I get something a bit more “free”. The server won’t be visible online, it will help me to validate my solution.
The fifth step depends on the success of the previous step. If it works, I’ll use a VPN on an Internet brick instead of a Raspberry Pi (and I’ll install some softwares to reduce the deny of service attacks risk, especially fail2ban, denyhosts or ossec). Otherwise, I’ll use Github as a fallback.
The sixth step will consist in redirecting my website on Sourceforge to my new home.
Thank you for your suggestions.
I advice you to use Git.
It is very powerful than CVS and SVN.
Yes I use it. I just want to migrate my Subversion repository to Git cleanly without loosing any information.
when i moved from to svn to git i just started to push the same working tree to both at the same time. having .git and .svn on ignore for the opposite. that worked fine, but i did not move the commit logs obviously.
did you manage to port the history ?
Remember what I said about becoming the IT department? http://www.java-gaming.org/topics/wiki-edit-problem/36839/msg/350811/view.html#msg350811