80
edits
Difference between revisions of "GIT Migration"
m
Clarification on TortoiseGit and alternatives
(→Things to tweak in the repository conversion: endlines) |
m (Clarification on TortoiseGit and alternatives) |
||
| Line 59: | Line 59: | ||
: How does that compare to [http://code.google.com/p/tortoisegit/ TortoiseGit] and [http://code.google.com/p/gitextensions/ Git Extensions] ? The latter seems to be pretty good (though I have not yet tried it myself, will see if I can do this tonight or tomorrow). It supposedly even features Visual Studio integration. --[[User:Fingolfin|Fingolfin]] 14:38, 2 November 2010 (UTC) | : How does that compare to [http://code.google.com/p/tortoisegit/ TortoiseGit] and [http://code.google.com/p/gitextensions/ Git Extensions] ? The latter seems to be pretty good (though I have not yet tried it myself, will see if I can do this tonight or tomorrow). It supposedly even features Visual Studio integration. --[[User:Fingolfin|Fingolfin]] 14:38, 2 November 2010 (UTC) | ||
:: TortoiseHG on Windows runs very well against a HG repo. I've also pulled a Git repo with hg-git and it worked but I haven't done any major development in that configuration yet (eg, branch/merge, etc). --[[User:ScottT|ScottT]] 20:58, 2 November 2010 (UTC) | :: TortoiseHG on Windows runs very well against a HG repo. I've also pulled a Git repo with hg-git and it worked but I haven't done any major development in that configuration yet (eg, branch/merge, etc). --[[User:ScottT|ScottT]] 20:58, 2 November 2010 (UTC) | ||
::I've also been using TortoiseHG for lastexpress/create_project/scummvm development (no branching/merging used either yet). I'm also using the subversion bridge to commit back to the current repo. The svn<=>mercurial<=>git conversion is not perfect (putting extra HG info in the git comments), but that will be a moot point once the transition to git is complete. I'm also using a modified version of [https://github.com/Littleboy/posh-hg Posh-hg] for better command-line integration. | :: I've also been using TortoiseHG for lastexpress/create_project/scummvm development (no branching/merging used either yet). I'm also using the subversion bridge to commit back to the current repo. The svn<=>mercurial<=>git conversion is not perfect (putting extra HG info in the git comments), but that will be a moot point once the transition to git is complete. I'm also using a modified version of [https://github.com/Littleboy/posh-hg Posh-hg] for better command-line integration. | ||
::I'm seeing performance problems (apparently caused by dulwich) when trying to push a converted scummvm repo to github though. It works great for small projects but will abort (out of memory) on huge repositories (not to mention the slowness in converting revisions and packing for sending). Is there a public scummvm tree on github so I can try importing it and pushing back to a new repo? (note that you can convert using hg-git and then push back the results directly with git, but that's painful). | :: I'm seeing performance problems (apparently caused by dulwich) when trying to push a converted scummvm repo to github though. It works great for small projects but will abort (out of memory) on huge repositories (not to mention the slowness in converting revisions and packing for sending). Is there a public scummvm tree on github so I can try importing it and pushing back to a new repo? (note that you can convert using hg-git and then push back the results directly with git, but that's painful). | ||
::For Visual Studio integration with Mercurial, there is [http://visualhg.codeplex.com/ Visual HG] (and a couple other projects), which work relatively well (although lacking features compared to AnkhSVN) --[[User:Julien|Julien]] 14:35, 3 November 2010 (UTC) | :: For Visual Studio integration with Mercurial, there is [http://visualhg.codeplex.com/ Visual HG] (and a couple other projects), which work relatively well (although lacking features compared to AnkhSVN) --[[User:Julien|Julien]] 14:35, 3 November 2010 (UTC) | ||
: Folks, you all write in reply to what I wrote, but without addressing at all the ''content'' of what I wrote. That's really a pity. Before debating which hg<->git bridge to use, could you maybe explain to us why TortoiseGit and Git Extensions (which, by the way, also includes Visual Studio integration) are to be dismissed out of hand? Thanks! :) --[[User:Fingolfin|Fingolfin]] 21:53, 3 November 2010 (UTC) | : Folks, you all write in reply to what I wrote, but without addressing at all the ''content'' of what I wrote. That's really a pity. Before debating which hg<->git bridge to use, could you maybe explain to us why TortoiseGit and Git Extensions (which, by the way, also includes Visual Studio integration) are to be dismissed out of hand? Thanks! :) --[[User:Fingolfin|Fingolfin]] 21:53, 3 November 2010 (UTC) | ||
:: There is no reason to dismiss them. If one wants to use git on windows, TortoiseGit is relatively nice (but not quite as good as TortoiseSVN in terms of stability). I haven't checked lately but Git Extensions did not integrate into Visual Studio as well as other source control providers (that might have changed since then). Another tool for Visual Studio is [http://gitscc.codeplex.com/ Git SCC]. On a personal note, I tried Git (both command line only and msysgit) and it didn't work for me (and the maintainers attitude and complete lack of release testing sure didn't help). Nevertheless, alternatives are just that. The main recommendation for hacking on ScummVM should be git and the related tools, how to setup mercurial and a git bridge can be relegated to a subpage on the wiki (including that discussion). --[[User:Julien|Julien]] 00:15, 4 November 2010 (UTC) | |||