4 ms·
Why do you hate using mercurial? You like to type things like this: git fetch <project-to-union-merge> GIT_INDEX_FILE=.git/tmp-index git-read-tree FETCH_HE
by EGreg 15y ago
Why do you hate using mercurial? You like to type things like this:
git fetch <project-to-union-merge>
GIT_INDEX_FILE=.git/tmp-index git-read-tree FETCH_HEAD
GIT_INDEX_FILE=.git/tmp-index git-checkout-cache -a -u
git-update-cache --add -- (GIT_INDEX_FILE=.git/tmp-index git-ls-files)
cp .git/FETCH_HEAD .git/MERGE_HEAD
git commit
instead of this:
hg pull --force <project-to-union-merge>
hg merge
hg commit
Mercurial "just works", and its commands are less arcane.
To be fair, git is now much easier to use. But also to be fair, mercurial has become much more powerful. In mercurial, doing straightforward things is simple, and doing complicated things is more complex, which is the way it should be IMHO
It even has rebase, although one might argue that is not a great differentiating feature for a REPOSITORY
- windsurfer 15y agoUnion-merging is insane and thus should take some insane understanding of what you're doing before you can do it. Anyone that's merging two unrelated repositories should understand what's going on under the hood anyways. What you're doing in git actually makes sense, since a normal pull is just fetch+checkout+merge+commit, you have to go into the plumbing and trick every step of the way to fetch, checkout, and merge using the wrong repositories. In the future, this could be made porcelain as it has been in hg, but do people really want to do this? It's much safer and saner to use submodules for 99% of use cases.
- EGreg 15y agoI still think people prefer git to mercurial these days (if we ignore github) for the same reason they prefer vim because real programmers use butterflies. http://xkcd.com/378/ http://xkcd.com/378/
- kevingadd 15y agoWhat does that even do? I've never had to do anything remotely that complicated with git. Try using patch queues for a while and tell me that Mercurial "just works" and isn't arcane. Nonsense.
- viraptor 15y agomq is pretty much the same as stg in my experience. Is there any big difference?
- dstufft 15y agohttp://progit.org/book/ch6-7.html http://progit.org/book/ch6-7.html
- rdtsc 15y ago> You like to type things like this: Why would I have to type that? I have been using git for 4 years and never had to type git-update-cache --add or copying .git/FETCH_HEAD. Are you spreading FUD?
- viraptor 15y agoIt's an edge case, but still true... Not something you'd do more than once a year probably ;)