News for hackers. Stuff that matters.
Re:I'm going to slowly move on from Mercurial by zeveb on Monday January 25, 2016 @12:52PM (#10968648)
> Mercurial also ran on Windows far, far earlier than Git did. A few projects (notably Mozilla) selected Mercurial for that reason, because they had developers on Windows.

Ouch, yet another way in which running on Windows can lead to poor technical decisions.

In my own case, I really preferred hg's command congruence to SVN; git's deceptive similarity took a long time to get over.

> I originally saw the index as an obstacle to the commit model I'd gotten used to from subversion. Today, I find it a critical part of git's culture of making small commits with one logical change each.

Same here, on both counts. I'd never go back, now, but it did take time to understand the benefits.

Re:I'm going to slowly move on from Mercurial by tzs on Monday January 25, 2016 @01:42PM (#10968979)
> Ouch, yet another way in which running on Windows can lead to poor technical decisions.

Are you implying that choosing hg was a poor technical decision?

Or are you just making the general observation that if you include non-technical requirements when choosing a tool (and if we accept that running on a specific set of platforms is not a technical requirement...) then you might not end up with the choice that would have been best if all the requirements were purely technical?

If the former, then you should elaborate. As far as I was able to determine when I evaluated both hg and git is that they are essentially equivalent technically. Git's default interface makes some things visible that hg keeps behind the scenes, but these are all a quick hg extension installation away for those who want them.

Re:I'm going to slowly move on from Mercurial by JoshTriplett on Monday January 25, 2016 @01:59PM (#10969102)
> As far as I was able to determine when I evaluated both hg and git is that they are essentially equivalent technically.

Today, yes. Significant work went into getting Mercurial's internals up to parity with Git's, and conversely into getting Git's UI up to parity with Mercurial's.

Re:I'm going to slowly move on from Mercurial by carussell on Monday January 25, 2016 @05:02PM (#10970300)
Respectfully, Git still has a long way to go before it achieves parity with Mercurial, or even its state of the art from, say, 2010.

Don't discount the effect that familiarity with a tool or process can have on your perception of it. The most succinct explanation of this effect that I know comes from the title of a post on the Light Table blog called, "Pain We Forgot".

Coming from a Mozilla-influenced, pre-GitHub-explosion background, I'm one of those people always favored Mercurial but used both out of necessity. Mostly that meant using hg for my own stuff that is most likely never to see the light of day and git for almost everything else. But I also ended up calling it quits on Mercurial and pulled the trigger on git-for-everything last week.

So, having just written (what should be a completely unnecessary) tool to dump out stats about files' line ending conventions, again, I'll say that Git has a long way to go.

(And before you ask, yes the problem manifests itself using the latest version of Git, and there's nothing exotic or wacky to my workflow, nor am I witnessing the effect of interplay with other tools of dubious quality. This is an outright case of Git's tendency to drop the ball and then gesture in the vague direction of a poorly documented non-fix that cuts orthogonally to the problem it's supposed to be solving.)

Re:I'm going to slowly move on from Mercurial by olau on Monday January 25, 2016 @07:13PM (#10971050)
Mercurial has some warts of it own. Common case of working on something, then wanting to update the repository in the midst of it to get something from a co-worker isn't handled exactly stellar.

So you can shelve. When you have enabled the extension.

If I'm not mistaken, even CVS handled this better.

Re:I'm going to slowly move on from Mercurial by 16bytes on Tuesday January 26, 2016 @09:34AM (#10973522)
> hg clone . ../CloneForCoworkerInvestigation

This is way, way better than CVS. Some people complain about how this doesn't work in place, like git or shelve, but I prefer I don't have to change anything in my main repo, like regenerate IDE files, dependency caches etc.

In any event, I've always like how this worked.

Re:I'm going to slowly move on from Mercurial by forty on Monday January 25, 2016 @06:12PM (#10970734)
Can you explain what's the relation between git or mercurial and files' line ending convention and what problem there is? I have used both and never met this kind of problem
Re:I'm going to slowly move on from Mercurial by carussell on Monday January 25, 2016 @09:52PM (#10971567)
It's not Mercurial and Git line ending conventions, it's that Windows uses CRLF and Unix uses LF, and Git's approach to addressing this is pretty far short of good.

(Another pre-emptive response: yes I'm aware of both core.autocrlf and "text eol", but those are exactly the sort of sideways-cutting non-fixes that I'm talking about.)

Re:I'm going to slowly move on from Mercurial by JoshTriplett on Monday January 25, 2016 @10:04PM (#10971602)
What's the behavior you expect, compared to the behavior that you get with git's configuration options?
Re:I'm going to slowly move on from Mercurial by carussell on Tuesday January 26, 2016 @01:21AM (#10972116)
I've tried to write and rewrite this comment, but it oozes disdain every time. So here's my best:

I expect that if a file uses CRLF everywhere, `git merge` will not leave it in a state with mixed line endings after inserting conflict resolution markers that end in LF instead of CRLF.

This shouldn't require a configuration option, but if it does, fine. However, Git doesn't even seem to have this.

What it does have are 'autocrlf' and 'eol' and 'text' options/attributes. For anyone who mentions those, I'm going to ask that you be familiar with not just what those actually control, but also how they're documented in the git man pages and in the book from git-scm.org—the entire premise was a discussion about Git's user-facing parts. By either source, those options control line normalization (i.e., implicit automatic conversion), which is not what I'm talking about. And the documentation for those is sick enough that even if they were the things to look to in order to configure this, then the idea that Git's UI is on par with Mercurial nowadays would still be wrong.

EDIT: To clarify, the desired approach for this is, "Use whatever line endings the file is already using". Git's approach to this is, "Standardize on either LF or CRLF, and at your discretion enable what amounts to some glorified git hooks to ensure that policy is followed, through the use of some obtusely documented configuration options. Make sure to work around any problems with that (e.g., when it's corrupting files that should have never been normalized) by applying another liberal layer."

Re:I'm going to slowly move on from Mercurial by cyphar on Tuesday January 26, 2016 @02:20AM (#10972273)
"Don't standardise on line endings" is not a good idea. The whole CRLF thing is already completely stupid. Why are you trying to justify a dumb design decision, and claim that trying to standardise the way source code line endings are stored is a bad thing.

Not to mention that you can't send CRLF in emails. So how are you going to email patches.

Re:I'm going to slowly move on from Mercurial by jcranmer on Monday January 25, 2016 @02:34PM (#10969350)
It's worth pointing out that part of the reason that Mozilla selected Mercurial over Git was that the Mercurial developers were more willing to help fix issues that Mozilla had identified than Git was, with Windows support being the most important point.

In a way, actually, that still seems to be the case. The Mercurial community seems to be working hard on making enormous monolithic repositories much more performant and realiable, whereas a lot of Git community seems to prefer to merely respond "YOU'RE USING IT WRONG" to these issues (although I suspect the developers themselves are also working on some of the issues; it's just that I see the community at large as much more visible).

So there's definitely a sense to me that Mercurial is the better VCS because it will quietly support whatever development model you want to use, whereas Git tries to force you to use the One True Model™--and I'm firmly in the camp that development tools should support developers' habits, not force them.

Re:I'm going to slowly move on from Mercurial by glandium on Monday January 25, 2016 @09:22PM (#10971495)
> So there's definitely a sense to me that Mercurial is the better VCS because it will quietly support whatever development model you want to use, whereas Git tries to force you to use the One True Model™

Considering the number of tools based on the Git data model to do completely unrelated things (I'm thinking about e.g. bup or git-annex). I wouldn't say that's Git imposes you a One True Model. Also, Git doesn't restrict you to an arbitrary number of parents on a commit ;).

BTW,

> The Mercurial community seems to be working hard on making enormous monolithic repositories much more performant and realiable

The irony is that to do so, Mercurial had to bend its data model, adding (backwards incompatible) support for per-directory manifests (which sound a lot like trees in Git, except the part where manifests have history attached to them, where Git only has history attached to commits).

Re:I'm going to slowly move on from Mercurial by __david__ on Monday January 25, 2016 @03:21PM (#10969666)
> So there's definitely a sense to me that Mercurial is the better VCS because it will quietly support whatever development model you want to use, whereas Git tries to force you to use the One True Model™

Wow, I can't disagree with that notion more. I've been on many projects that use git and practically every one used git in different ways. I've never felt that git was trying to force a particular workflow on me. Git's greatest strength, to me, has always been its toolbox nature—you can make it do whatever you like (want to comb through your entire repo and change someone's email address, or backdate an entire branch? No problem!).

Re:I'm going to slowly move on from Mercurial by koenigdavidmj on Monday January 25, 2016 @01:40PM (#10968961)
Hg worked on Windows from the beginning because it was written in Python. Python best practices make it pretty easy to avoid Windows-specific quirks (use os.path.join for directory munging, and don't use hard links). Git was a bit of C at first, which got wrapped in successive levels of bash and Perl, neither of which were particularly well supported on Windows 16 years ago.
Re:I'm going to slowly move on from Mercurial by masklinn on Monday January 25, 2016 @02:55PM (#10969502)
> Git was a bit of C at first, which got wrapped in successive levels of bash and Perl, neither of which were particularly well supported on Windows 16 years ago.

Not that this has changed much, the CLI git has been renamed to "git on windows" but fundamentally you're still installing msys (2) to run git.

That issue is greatly mitigated by the existence of libgit2 though, it builds natively on windows (and just about everything else) so windows git (GUI) clients need not depend on CLI git.

Re:I'm going to slowly move on from Mercurial by glandium on Monday January 25, 2016 @09:54PM (#10971575)
> but fundamentally you're still installing msys (2) to run git.

You're installing msys to run git because (I guess) it was considered the git CLI would be useless without a decent shell. Would you see yourself use Git or Mercurial in cmd?

Git itself in Git for Windows, afaik, is not actually an msys program, and uses native win32 APIs.

Re:I'm going to slowly move on from Mercurial by TylerE on Monday January 25, 2016 @11:18PM (#10971796)
Ever heard of a thing called powershell?
Re:I'm going to slowly move on from Mercurial by cyphar on Tuesday January 26, 2016 @02:23AM (#10972286)
Is that like Bash for Kids?
Re:I'm going to slowly move on from Mercurial by koenigdavidmj on Tuesday January 26, 2016 @04:48PM (#10976390)
Maybe that's a poor description of a tool with full access to the entire class hierarchy of the .NET Framework. You could write a GUI program in it with WPF, although most people would take it as a kindness if you didn't.
Re:I'm going to slowly move on from Mercurial by pcwalton on Monday January 25, 2016 @01:31PM (#10968898)
> Ouch, yet another way in which running on Windows can lead to poor technical decisions.

I didn't see any indication in the parent comment (or in general, really) that Windows support was the cause of Mercurial's difficulty in implementing those features.

Re:I'm going to slowly move on from Mercurial by apetresc on Monday January 25, 2016 @02:14PM (#10969196)
He means that Mozilla devs running Windows led them to adopt Mercurial (which was, in his opinion, a "poor technical decision"). Not that Mercurial made poor technical decisions as a result of supporting Windows.
Re:I'm going to slowly move on from Mercurial by theandrewbailey on Monday January 25, 2016 @01:33PM (#10968913)
> Ouch, yet another way in which running on Windows can lead to poor technical decisions.

I've never heard from anyone that choosing/using Mercurial was a poor decision. Are you biased?

Re:I'm going to slowly move on from Mercurial by jgraham on Monday January 25, 2016 @06:35PM (#10970850)
Well arguably the long-term result for Mozilla is that we have ended up having to support two version control systems for everything because there has been less resistance to that than trying to force people to use mercurial for everything (for the projects that were already in mercurial people wrote git bridges, and for new projects people tended to start them on GitHub). I strongly doubt that there would have been the same problem if we had used git from the start. I suspect this is a net negative, even if you believe the rhetoric that mercurial (or future-mercurial) has technical advantages in some areas.

Edit: to be clear, the kind of "everything" I have in mind is the code review system which now has to support two version control tools. Indeed if we'd used git from the start there might well have been an off-the-shelf code review tool we could have used without putting multiple man years of effort into customisations.

Re:I'm going to slowly move on from Mercurial by zeveb on Monday January 25, 2016 @04:00PM (#10969901)
> I've never heard from anyone that choosing/using Mercurial was a poor decision.

I liked hg too, but as the passage of time has indicated choosing it for one's project would have been a mistake, as git has effectively won.

Re:I'm going to slowly move on from Mercurial by theandrewbailey on Monday January 25, 2016 @07:47PM (#10971195)
You haven't mentioned why you think Git won. If by "won", you mean "is more popular", then yes, it won. But that criteria alone doesn't make a decision bad. When changing gives you no clear advantage, why change to something more popular?
Re:I'm going to slowly move on from Mercurial by lsaferite on Tuesday January 26, 2016 @07:57AM (#10973157)
Isn't that akin to arguing that choosing to distribute your movies only on Betamax is not a bad decision?
Re:I'm going to slowly move on from Mercurial by dvdgsng on Monday January 25, 2016 @05:51PM (#10970622)
won what?
Re:I'm going to slowly move on from Mercurial by acveilleux on Monday January 25, 2016 @08:08PM (#10971261)
It has won GitHub, that's mostly it.

Separately, GitHub has won the "place where you share you project code" prize that used to belong to sourceforge.

Re:I'm going to slowly move on from Mercurial by ngoldbaum on Monday January 25, 2016 @01:02PM (#10968705)
I do the same thing with mercurial's "hg commit -i" interactive interface. There's also a very nice curses interface for interactive hunk selection which is currently behind an experimental config flag but is shipped with the core application.
Re:I'm going to slowly move on from Mercurial by oblio on Monday January 25, 2016 @01:28PM (#10968869)
> Ouch, yet another way in which running on Windows can lead to poor technical decisions.

That's quite dismissive of Windows...