Language Selection

English French German Italian Portuguese Spanish

Mercurial vs Git

Filed under

There are many blog posts and articles all over the Internet providing comparissons between Git and Mercurial. Most of them only briefly describe the main differences and then try to decide which one is better. However, I didn’t find many articles explaining the differences in detail from a neutral point of view and that’s what I’ll try to do here, also providing links to relevant documentation. For simple uses like a single user managing a private project, Git and Mercurial are equivalent. Their workflow differs a little due to the underlying differences, but their usage doesn’t seem to be very far apart. However, those differences start being noticeable when you collaborate with more users and, the more complex the project is, the more you will notice them. I will focus on four main aspects. Hopefully, this information could be useful to Mercurial users wanting to know how Git works and vice versa, as well as novice users who are not using either one yet. In that case, I suggest you to experiment a little bit with both instead of trying to make a theorical decision based on what you read in the documentation or in articles like this one.

  1. The repository structure, that is, how each one of them record changes and history.

  2. The noticeable differences in how they manage the branching process.
  3. Documentation.
  4. Their two popular hosting sites, GitHub and Bitbucket.

rest here

More in Tux Machines

Red Hat and Fedora

Android Leftovers

Zorin OS 12 Beta - Flat white, no sugar

I did not do any other testing, no extensive tweaking, no customization. I felt no need or desire to do so. Now, do remember Zorin OS 12 is still in beta, so we can excuse some of the problems we see here. But others are purely Ubuntu, and have been ported over from the parent distro without any discrimination or any improvements and fixes introduced in the last six months. The big offenders include: multimedia and smartphone support, poor software management, and then the somewhat heavy utilization and slow performance. Zorin is quite pretty but weary on the eyes, it tries perhaps too hard to be more than it is, and overall, the value it brings is negatively offset by the myriad papercuts of its design and the implementation of its unique style, plus the failings of the Ubuntu family. It's an okay choice, if you will, but there's nothing too special about it anymore. It's not as fun as it used to be. Gone is the character, gone is the glamor. This aligns well with the overall despair in the Linux desktop world. Maybe the official release will be better, but I doubt it. Why would suddenly one distro excel where 50 others of the same crop had failed with the exact same problems? Final grade, 5/10. Test if you like the looks, other than that, there's no incentive in really using Zorin. Oh how the mighty have fallen. Read more

PlayStation 4 hacked again? Linux shown running on 4.01 firmware

Hackers attending the GeekPwn conference in Shanghai have revealed a new exploit for PlayStation 4 running on the 4.01 firmware. In a live demo you can see below, once again the Webkit browser is utilised in order to inject the exploit, which - after a conspicuous cut in the edit - jumps to a command line prompt, after which Linux is booted. NES emulation hilarity courtesy of Super Mario Bros duly follows. Assuming the hack is authentic - and showcasing it at GeekPwn makes the odds here likely - it's the first time we've seen the PlayStation 4's system software security compromised since previous holes in the older 1.76 firmware came to light, utilised by noted hacker group fail0verflow in the first PS4 Linux demo, shown in January this year. Read more Also: 'Deus Ex: Mankind Divided' Coming To Linux In November, Mac Port On Hold