5 ms·

Could you elaborate on this? Do you mean CLI/UI?

by rrrene 13y ago

StavrosK 13y ago
Yes, I haven't used Mercurial too extensively (I use git), but Mercurial's commands make more sense to me. The only problem I have with it is that conflicts throw me into vim, and if I exit it to try and make sense of the merges, it thinks I'm done merging and leaves me in an unreasonable state, whereas git just marks the files and lets me resolve them at my leisure.
- durin42 13y ago
  You probably need to disable a merge tool. Check 'hg showconfig merge-tools' and you'll probably find something. If this is on a debian derived system, I think that package maintainer turns on a bunch of stuff by default, so you may need to find a file in /etc/hg or similar.
- hrydgard 13y ago
  Not that I use hg anymore, but if I remember correctly, exiting vim with :cq (returning an error code) solves that.
  - StavrosK 13y ago
    That's very interesting to know in general, thank you.
- RobAtticus 13y ago
  Using "hg help merge-tools" it describes some different merge tool settings that you might fine helpful. For example if you want it to merge all files it can, and mark the ones it can't fully merge you can try "internal:merge". To set it for your user globally, in your .hgrc put "merge=internal:merge" under [ui].
  - StavrosK 13y ago
    Fantastic, thank you.
rsobers 13y ago
I feel Mercurial's commands are more intuitive than Git's, especially to former SVN users. Functionally, they're so similar it doesn't matter. This is why I love Kiln Harmony--I can work on a Git team and use Mercurial. Kind of like I can work on a dev team that uses Emacs while I use Vim. It shouldn't matter.
- arunc 13y ago
  I am totally with you on this, albeit kiln harmony is only available for managed hosting.
- Skinney 13y ago
  Kiln Harmony was awesome, as I'm one of two developers in a team of eigth who prefers Git instead of Hg. Then we decided to use sub-repoes/submodules, and kiln harmony can't handle that, and our other team members simply WONT use git :(
- twic 13y ago
  I work in a company that uses Git, plus Subversion for legacy stuff. I use Mercurial with hg-git and hgsubversion. There are occasional hiccups, but they mostly work like a charm. I'm happy because i get to use Mercurial, and my colleagues are happy because they have someone who can help them out by running complex revset queries!

Could you elaborate on this? Do you mean CLI/UI?

by rrrene 13y ago

Could you elaborate on this? Do you mean CLI/UI?

Yes, I haven't used Mercurial too extensively (I use git), but Mercurial's commands make more sense to me. The only problem I have with it is that conflicts throw me into vim, and if I exit it to try and make sense of the merges, it thinks I'm done merging and leaves me in an unreasonable state, whereas git just marks the files and lets me resolve them at my leisure.

durin42 13y ago
You probably need to disable a merge tool. Check 'hg showconfig merge-tools' and you'll probably find something. If this is on a debian derived system, I think that package maintainer turns on a bunch of stuff by default, so you may need to find a file in /etc/hg or similar.
hrydgard 13y ago
Not that I use hg anymore, but if I remember correctly, exiting vim with :cq (returning an error code) solves that.
- StavrosK 13y ago
  That's very interesting to know in general, thank you.
RobAtticus 13y ago
Using "hg help merge-tools" it describes some different merge tool settings that you might fine helpful. For example if you want it to merge all files it can, and mark the ones it can't fully merge you can try "internal:merge". To set it for your user globally, in your .hgrc put "merge=internal:merge" under [ui].
- StavrosK 13y ago
  Fantastic, thank you.

rsobers 13y ago

I feel Mercurial's commands are more intuitive than Git's, especially to former SVN users. Functionally, they're so similar it doesn't matter. This is why I love Kiln Harmony--I can work on a Git team and use Mercurial. Kind of like I can work on a dev team that uses Emacs while I use Vim. It shouldn't matter.

arunc 13y ago
I am totally with you on this, albeit kiln harmony is only available for managed hosting.
Skinney 13y ago
Kiln Harmony was awesome, as I'm one of two developers in a team of eigth who prefers Git instead of Hg. Then we decided to use sub-repoes/submodules, and kiln harmony can't handle that, and our other team members simply WONT use git :(
twic 13y ago
I work in a company that uses Git, plus Subversion for legacy stuff. I use Mercurial with hg-git and hgsubversion. There are occasional hiccups, but they mostly work like a charm. I'm happy because i get to use Mercurial, and my colleagues are happy because they have someone who can help them out by running complex revset queries!