Difference: Git (5 vs. 6)

Revision 62010-09-08 - ChrisNell

Line: 1 to 1

META TOPICPARENT	name="EmpiricalAlgorithmics"

Git

Line: 103 to 103

many more commands are available in the TortoiseGit menu if you hold shift before right-clicking. For example, you must do this to delete a branch (Shift+Rclick>TortoiseGit>Browse Reference)

Changed:

<
<

Mercurial and Git

>
>

Eclipse and Git

Changed:

<
<

Git is popular. However, it doesn't always have the best UI. For example, the Eclipse plugin for Git is.... a work in progress. Fortunately, the MercurialEclipse plugin is a lot better (http://www.javaforge.com/project/HGE

), and can be made to work with Git using the Hg-Git (http://hg－git.github.com/

) plugin for Mercurial. I've done this on a Mac, in particular.

Note that use of this plugin is quite problematic in some cases, particular where users of only Git and users of the Hg-Git plugin are sharing a repository and creating branches. We're now recommending that users avoid this plugin if at all possible and stick to the Git console tools or Tortoise.

Mercurial+Git+Windows

In principle it's also possible to have TortoiseHg (http://tortoisehg.bitbucket.org/) clone and push to a Git repository, but at present we recommend TortoiseGit over this indirect use of TortoiseHg. That said, a tutorial to do this can be found at: http://jamesmckay.net/2010/06/tortoisehg-as-a-github-client-on-windows/ Note that to make mercurial successfully clone from git+ssh repositories (as opposed to, for example, github), we had to make a copy of TortoiseHg\TortoisePlink.exe called ssh.exe, and ensure this was in the Windows path. You may also want to enable the Hg bookmarks plugin.

One might do this to attempt to make MercurialEclipse work in Windows. Note that we have not yet successfully configured MercurialEclipse+hg-git+Windows and had it perform all functions (clone, synchronize) successfully, so for now recommend using TortoiseGit to do version control separately from Eclipse. That said, if you want to try, a few tips are: In MercurialEclipse you will need to go to Window>Preferences>Team>Mercurial and set the mercurial executable to use TortoiseHg\hg.exe instead of the bundled version.

>
> Git is popular. However, it doesn't always have the best UI. For example, the Eclipse plugin for Git is not as polished as that for CVS. That said, it is under active development (Eclipse itself is switching to Git) and if you use Eclipse Helios, the plugin is usable for many common cases (you still may have to fall back to the command line for more complex merging tasks).

-- ChrisNell - 23 Jun 2010

View topic | History: r7 < r6 < r5 < r4 | More topic actions...