Tag: mercurial

Git: rewriting history to collapse commits with the same message and time (merging submodules)

We are working on a huge project. At the beginning of development we decided to use Mercurial with a subrepositories feature. After 2 years of development we had 10 separated modules with a repository for every one. We found, that the subrepositories are not the best solution for us and also found that Git is […]

Sharing files in different projects to the same folder in HG/Git

We are trying to move from Visual SourceSafe(VSS)/SourceOffsite(SOS) to HG/Git, there is one major problem that we have no idea how to deal with it properly. We distribute C++ source files to our users as part of our “Product X”, these source files are of course version controlled. Let’s say the source files are organized […]

Mercurial: Back out public changesets and reapply to new public branch?

We’re using Kiln and Fogbugz; Kiln is supposed to seamlessly allow git and hg to work together. However, we’ve run into an issue where git branches are treated like bookmarks in mercurial; we didn’t catch this in our repo until changes had been pushed, and now the branches are a bit polluted. I have public […]

What are branches in BitBucket and how to manage them

I have the following problem. I have a repo, which I originally cloned from github using hg-git, but since I’ve been developing on it in mercurial. The original dev also keeps updating the repo, so we have multiple heads and I merge whatever I want using TortoiseHg, it works really well (I think hg-git doesn’t […]

Why did Git and Mercurial use SHA1

This question already has an answer here: Why does Git use SHA-1 as version numbers? 3 answers Why does Git use a cryptographic hash function? 1 answer

What is a recommended way to manage git patch queues in unrelated repositories

So, I have many repositories I need to manage patchsets in git. I primarily work on what I’ll call issue-branches (Unsure if thats an official terminology for git, but its short-lived branches for each issue). I do have a habit of rebasing if they end up taking longer to iron out, or even squashing if […]

How to deal with custom configuration on versioned files? – git

This question already has an answer here: How do you deal with configuration files in source control? 19 answers

BitBucket colored diff email service

Does anyone know about anyway to send out colored diffs of commits in bitbucket? I reckon you can do that by pushing out a HTTP call to your own server, but I need a solution in case you do not have your own server to rely on. I am a big fan of SVN::Notify, so […]

Configuring PATH globally for SSH remote commands

I have a problem with the PATH variable on Debian Linux when executing commands via SSH. This happens for example when I use GIT or Mercurial and I have them installed in /opt instead of /usr/local. But I can also reproduce this easily like this: When I login to the server via SSH in a […]

How do you prevent your Mercurial (or Git) branches from being locked up?

I want to throw this scenario out there and see what the most objective, vanilla-Mercurial way to fix this would be. Suppose I have the following branches in my centralized Mercurial repository for my centralized, non-distributed web-app: repository default feature1 feature2 bugs Suppose ten developers have committed fixes to the ‘bugs’ branch and pushed. Now […]

Git Baby is a git and github fan, let's start git clone.