I'm not really aware of any problems with mercurial's git-support[1]. It might not really be "working with git", but does support working with (as in pushing and pulling) git repos. And while I think there'll never be a consensus on mercurial versus git -- I find that the interface is much cleaner in mercurial, than with git.
So if by "easier" you mean "easier command line use", I think mercurial is worth a look. If not, perhaps look at various guis -- but I've not got any experience with them.
hg help git
Working with Git Repositories
"""""""""""""""""""""""""""""
Basic Use
---------
You can clone a Git repository from Hg by running "hg
clone <url> [dest]".
For example, if you were to run:
$ hg clone git://github.com/schacon/hg-git.git
Hg-Git would clone the repository and convert it to an
Hg repository for you.
(...)
If you are starting from an existing Hg repository,
you have to set up a Git repository somewhere that
you have push access to, add a path entry
for it in your .hg/hgrc file, and then run "hg push
[name]" from within your repository. For example:
$ cd hg-git # (an Hg repository)
$ # edit .hg/hgrc and add the target Git URL in
# the paths section
$ hg push
[1] http://hg-git.github.io/(And I suspect that if I could do that reliably I would have internalised enough git to use that natively.)
However, after forking a repo on github, everything seems to work fine for me:
hg clone git+ssh://[email protected]:e12e/QuickTun.git qt.hg
cd qt.hg
echo "Mercurial hg-git test." > test
hg add test
hg ci -m "Just a test of hg-git push/pull to github."
hg push
# outputs:
pushing to git+ssh://[email protected]:e12e/QuickTun.git
Warning: Permanently added the RSA host key for IP
address '192.30.252.131' to the list of known hosts.
searching for changes
adding objects
added 1 commits with 1 trees and 1 blobs
updating reference refs/heads/master
I can see how the need for using ssh could be a problem on windows, where you need to (AFAIK) get plink/putty working. A quick search seems to indicate that there's no support for using paramiko (python native ssh client/server) for the mercurial client.> it doesn't seem to help you with some of the more horrible git interactions, such as doing a pull from upstream to your forked github repository.
Continuing from above, nothing stops you from:
hg pull git+ssh://[email protected]:UCIS/QuickTun.git
Although working with multiple remotes in mercurial is generally done by adding them to .hg/hgrc.Eg adding:
upstream = git+ssh://[email protected]:UCIS/QuickTun.git
Allows you to do: hg pull upstream
and hg push upstream
And you can get a sense of what's going on: hg tags
tip 59:b6067e2362b5
default/master 59:b6067e2362b5
upstream/master 58:e5d10c76fcad
Not sure if that helps vis-a-vis using git, but as I said, I find the mercurial commands more intuitive, consistent and friendly -- to the point that I find it makes quite a difference for me, personally.That said, if you want to/have to work with github-based repositories, you might be better off just sticking with git.
Gitless does not make it clear to me how to work with it in only a handful of sentences. By that measure, it doesn't seem easier than git.
You say: " We think the problem lies deeper than the user interface, in the concepts underlying Git"
But it seems to me that you just rely on the same concepts, but rename them or do nothing at all with them.
One of the concepts underlying git is a history made of unique deltas that can be referred to at any point in time (+ some change). It'd be cool if you made it easier to navigate or make those unique deltas (commits), rather than put a thin wrapper around them.