how NOT to commit

I just got e-mail:

"Sunsetting Mercurial support in Bitbucket

After much consideration, we've decided to remove Mercurial support bla bla bla crocodile tears bla bla..."

So basically, Bitbucket started out as a Mercurial repository hosting platform. After GitHub's rise in popularity, they decided "hey, everyone's welcome, both Hg and Git!" Then it became Git and "okay Hg too, but shhh don't tell anyone". Now they FINALLY completed running it into the ground: "Only 1% of repositories are Mercurial" - yeah no shit sherlock, after actively hiding the fact you support it, people don't find out you support it! Surprised Pikachu! Oh congrats, Atlassian. You're so smart.

Mercurial support was the sole reason I had repositories there. I mean, for Git we already have GitHub, GitLab and others. So what's their unique selling point again? What's that, the sound of crickets? Thought so.

So after that, hopefully they change the name to "Gitbucket". Or preferably "Bitfuckit".

Reminiscing the days before Mercurial and Git,

1) I delete foo.cpp.
2) I tell Subversion to delete foo.cpp from repository.
Subversion: Error - can't delete file because it doesn't exist locally.
3) I create some dummy foo.cpp.
4) Again, I tell subversion to delete it.
Subversion: Error - can't delete file because it exists locally.

Every time I get angry with Git (strangely never happens with Mercurial), I remind myself what Subversion was like.

Zip file back-ups for version control ??? And, more people do that over Mercurial ???

Sometimes I wonder how software development in (bigger) teams worked in the 90s.

Take the first Pokémon games for example. It was the mid-90s and the final product would be Assembler code that goes onto a cartridge with limited space.

I believe version control systems didn't really exist back then (Git & Mercurial: 2005, SVN: 2004). So probably people took backups of the chunks of code they worked on, copied around a stitched-together code, threw everything together at the end of the day, etc. etc. ...

Does anyone here know if there is some kind of documentary about that topic or did anyone here experience that first-hand?

It would be really interesting to see how that stuff worked back then 😊

I know that this will bring me many new enemy's but I'll just say it.

I like Mercurial more than Git.

I just started using git

I realised, that Git now has the same problem as Windows:
Its widespread because its widespread.

There are, especially for smaller projects, few reasons to actually use Git instead any other VCS.

Look at the landscape of free repo hosting.
There are hundreds, if not thousands of free Git hosters.
A handful of free Mercurial hosters,
Launchpad for Bazaar and I didn't even find a free SVN hoster.

Everyone uses Git, because there are Services for it, and there are Services for it, because everyone uses it.

!rant

So this has probably been asked loads of times but I've never seen it. When working on solo projects for yourself do you still use source control like git or mercurial?

I usually don't because when I do personal projects its usually filthy and fast development to prototype quickly.

However, this current project I'm working on I am using git and I'm finding that slowing myself down just to follow good practice is actually improving my code quality and my understanding of my own project.

What do you guys think about mercurial (hg)?

I think it has no place in a world where git exists and I prefer git.

Just wondering what the general sentiment is

My response, as a gamer and developer, when yet another guy tries to explain how "mercurial is so much easier to use":

Git gud

"No merge conflicts, ready to commit."

Such sweet words from TortoiseHg, and it's not even valentine's day!

Not just a rant, also a call for help.

After 10 years using Git, I'm constrained to use Mercurial (company policy). It effing feels like playing tennis with one arm tied to my back.

Please, who knows a good GUI for Linux, or at least a command line tool to show a decent log?

Kill Mercurial!

What would you prefer ? Mercurial or Git? why should i use mercurial and why not git? i am confused.

When your stand up meeting update is just, "yesterday I was lost in merge hell".

My work product: Or why I learned to get twitchy around Java...

I maintain a Java based test system, that tests a raster image processor. The client is a Java swing project that contains CORBA bindings to the internal API of the raster image processor. It also has custom written UI elements and duplicated functionality that became available in later versions of Java, but because some of the third party tools we use don't work with later versions of Java for some reason, it's not possible to upgrade Java to gain things as simple as recursive directory deletion, yes the version of Java we have to use does not support something as simple as that and custom code had to be written to support it.

Because of the requirement to build the API bindings along with the client the whole application must be built with the raster image processor build chain, which is a heavily customised jam build system. So an ant task calls out to execute a jam task and jam does about 90% of the heavy lifting.

In addition to the Java code there's code for interpreting PostScript files, as these can be used to alter the behaviour of the raster image processor during testing.

As if that weren't enough, there's a beanshell interface to allow users to script the test system, but none of the users know Java well enough to feel confident writing interpreted Java scripts (and that's too close to JavaScript for my comfort). I once tried swapping this out for the Rhino JavaScript interpreter and got all the verbal support in the world but no developer time to design an API that'd work for all the departments.

The server isn't much better though. It's a tomcat based application that was written by someone who had never built a tomcat application before, or any web application for that matter and uses raw SQL strings instead of an orm, it doesn't use MVC in any way, and insane amount of functionality is dumped into the jsp files.

It too interacts with a raster image processor to create difference masks of the output, running PostScript as needed. It spawns off multiple threads and can spend days processing hundreds of gigabytes of image output (depending on the size of the tests).

We're stuck on Tomcat seven because we can't upgrade beyond Java 6, which brings a whole manner of security issues, but that eager little Java updated will break the tool chain if it gets its way.

Between these two components we have the Java RMI server (sometimes) working to help generate image data on the client side before all images are pulled across a UNC network path onto the server that processes test jobs (in PDF format), by reading into the xref table of said PDF, finding the embedded image data (for our server consumed test files are just flate encoded TIFF files wrapped around just enough PDF to make them valid) and uses a tool to create a difference mask of two images.

This tool is very error prone, it can't difference images of different sizes, colour spaces, orientations or pixel depths, but it's the best we have.

The tool is installed in both the client and server if the client can generate images it'll query from the server which ones it needs to and if it can't the server will use the tool itself.

Our shells have custom profiles for linking to a whole manner of third party tools and libraries, including a link to visual studio 2005 (more indirectly related build dependencies), the whole profile has to ensure that absolutely no operating system pollution gets into the shell, most of our apps are installed in our home directories and we have to ensure our paths are correct for every single application we add.

And... Fucking and!

Most of the tools are stored as source bundles in a version control system... Not got or mercurial, not perforce or svn, not even CVS... They use a custom built version control system that is built on top of RCS, it keeps a central database of locked files (using soft and hard locks along with write protecting the files in the file system) to ensure users can't get merge conflicts by preventing other users from writing to the files at all.

Branching is heavy weight and can take the best part of a day to create a new branch and populate the history.

Gathering the tools alone to build the Dev environment to build my project takes the best part of a week.

What should be a joy come hardware refresh year becomes a curse ("Well fuck, now I loose a week spending it setting up the Dev environment on ANOTHER machine").

Needless to say, I enjoy NOT working with Java. A lot of this isn't Javas fault, but there's a lot of things that Java (specifically the Java 6 version we're stuck on) does not make easy.

This is why I prefer to build my web apps in python or node, hell, I'd even take Lua... Just... Compiling web pages into executable Java classes, why? I mean I understand the implementation of how this happens, but why did my predecessor have to choose this? Why?

FUCKING MERGE REQUESTS

Reading the JS source of Firefox is pretty interesting. It's a mashup of old and new code styles.

TLDR: A friend had only a local repository and fucked it up completly

A friend of mine had to do an project for school. Sche decided to do a little chat application. The requirements were to use java in combination of javafx.
Things started very well. Sometimes she asked me for a little help but that was no problem. She used mercurial for version control which was an inportant requirement too. But. The teacher didn't teach them how to use mercurial so all she had was a local repository. A few days ago she called me and told me that she fucked up the repository. I told her she should cerp calm and wait until i am at home. It's a fucking repository. this can be fixed i thought. But when i arrived at home and she sent me the repo i tried everything but a file (stored at .hg/store/) was missing. it was a manifest file. I asked her what happened to this file. "I deleted it because there were error messages because of it" FML. Why would you even delete such a file?
Luckily for her she sent me a copy of her repo to look at it a few days ago. so she only lost 5 commits.

why are Linux graphical git clients so crap? (as compared to TortoiseHg)

like GitKraken is the only OK one, but it lacks soo many features its nearly useless (bisect anyone?) + you need a commercial license

GitEye is the second non-shit one, but it regurarly stops working + its non-free

and it seems most git GUI clients force the name of the repo to be their parent dir. my parent dir for all web projects is www, so in both apps I have a long list of projects named www, unless I expand the projects sidebar to cover half of the screen to see the very very end of the path that petrays the actual project name in GitEye. In GitKraken I have to investigate the commit history to figure out if I have the right GitKraken with the right project open... talk about UX :D

so do most "git experts" just use git commit, git push and git pull on the command line and thats their whole world and the reason why they prefer git to mercurial (for all the many features they never use)?

My job uses Mercurial for scm

Is anyone out there using Mercurial in a commercial environment still? I always preferred Mercurial over Git back in the day but I find it hard to understand why anyone would still be using it other than out of stubbornness.

Installed mercurial,
Tried mercurial,
Got frustrated with the .hgignore thing,
Got frustrated with adding remotes,
Uninstalled mercurial.

JetBrains' IDEA. For being smart and integrated out of the box.
Mercurial + hg-git + MutableHistory. Like Git, but actually works and doesn't speak gibberish.
Fish shell. For leaving 80s in peace.
openSUSE Tumbleweed. For actually tested up-to-date software.
GNOME. For actually trying to improve UX.

I can't tell if this is a windows sourcetree problem or mercurial, but trying to do anything on this is a pain. Every action takes 3-4 seconds (including switching between history and working copy).

My project is 10 commits and 50 files, this is a horrible ux. Bazaar never had this many problems.

Bitbucket not supporting Mercurial anymore!?!?? FFFFFFfffff
Where am I going to move my team of 15 now..
Need to move all my repositories too without exceeding storage limits.

Why is Firefox still using Mercurial???? Arghhhh

Am I the only one that prefers HG to Git?

Git, Mercurial and others are distributed version control systems. Maybe it would have a federated version control system for hosting open source software...

*push*
"...multiple heads..."
*takes deep breath*

Almost all the company uses git, I even took a training about git and how does it integrate with internal tools.
In my team they use mercurial.
fml.

Using TFS outside of .Net projects it's a real pain. It's very close to Dropbox or Google Drive.