Mercurial is a fast, open-source, distributed version control system.

learn more… | top users | synonyms

-1
votes
0answers
51 views

Two repositories for the same project

I have a project that contains php files and swf files, all swf files are in a folder called "/swf" and the size of that folder exceeds 1GB. And the most of the work consists of php files. I have ...
3
votes
1answer
85 views

Dividing up the work of a large code merge among multiple people?

This question is related to this one: Why not commit unresolved changes? When needing to merge a large code base with many conflicts, I would like to have a way to commit progress to be shared ...
15
votes
7answers
701 views

Why not commit unresolved changes?

In a traditional VCS, I can understand why you would not commit unresolved files because you could break the build. However, I don't understand why you shouldn't commit unresolved files in a DVCS ...
3
votes
1answer
142 views

How to improve our source control process

Background: We are using agile project management and follow sprints to do development. We are using a single repository in bitbucket.org that uses mercurial. Repository is hosting 3-4 products. ...
12
votes
3answers
2k views

Branching breaks continous integration?

I think this article, A Successful Git Branching Model, is very well known among experienced DVCS users. I use hg mostly, but I would argue this discussion is fine for any DVCS. Our current ...
6
votes
4answers
215 views

Is there any downside to commit messages containing the ticket number

I was wondering if it would be good practice for commit messages to contain the ticket number they were apart of. It would be like 2568 Fix heating issue Summary of the issue with a bunch ...
2
votes
2answers
75 views

Mercurial Branching from a branch

We are in a situation where the customer has requested an urgent deployment of the current features we are working on. These features are being developed in a mercurial branch named 'sprint 1' for ...
2
votes
2answers
193 views

“Party on my branch” workflow support in mercurial

When I'm on a git project, I have a workflow that goes something like this: Start a new feature (open a new branch) Write some code, commit some code, repeat Push the code to a remote, possibly with ...
3
votes
4answers
169 views

Source control workflow for managing a software platform

I'm in charge of a software platform, written in C, that is used to provide a variety of projects to clients. I am trying to improve the workflow for people using this platform, and looking at ...
27
votes
7answers
3k views

How to choose between git and Mercurial [closed]

Both Git and Mercurial are DVCS, and that's great. I wonder if there is a list of particular situations when one of those systems are preferable, something like 'In mobile development for many ...
25
votes
6answers
2k views

Which DVCS (git or hg) is easier for programming students? [closed]

A bit of context: I'm in 3rd year of college. students are divided into teams of 4. Almost everyone will be working under windows (except a few like me who are on linux). As part of the school ...
3
votes
2answers
192 views

Does cherry-pick just pull changes into the current working tree as uncommitted changes?

My team uses Mercurial for version control. Our development / version control routine is: all been committing to the same branch pulling for changes and rebasing our commits locally before pushing ...
4
votes
1answer
294 views

How can I split a repository that contains many projects which share the same build system?

I've been working on the past years on a research compiler suite, which builds several executables and libraries. It has a build system (namely bootstrapper) that looks into the ./src/bin directory ...
5
votes
2answers
793 views

Is Perforce as good at merging as DVCSs?

I've heard that Perforce is very good at merging, I'm guessing this has to do with that it tracks changes in the form of changelists where you can add differences across several files in a single ...
4
votes
1answer
170 views

What is a good frequency for merging up feature branches to a main line?

We have a very large code base in mercurial. We have about a 6 month release cadence with 2 week sprints. For each release we have about 10 feature branches and maybe 5 or so people working per ...
0
votes
0answers
18 views

What is a good frequency for merging up feature branches to a main line? [duplicate]

We have a very large code base in mercurial. We have about a 6 month release cadence with 2 week sprints. For each release we have about 10 feature branches and maybe 5 or so people working per ...
0
votes
1answer
100 views

Why isn't the addremove recommended by default in Mercurial?

This is perhaps a question of strategy more than anything else. I am new to version control and I guess I should count myself lucky to have relatively more mature systems like Mercurial and Git at my ...
12
votes
6answers
7k views

What's so difficult about SVN merges?

Possible Duplicate: I’m a Subversion geek, why should I consider or not consider Mercurial or Git or any other DVCS? Every once in a while, you hear someone saying that distributed version ...
0
votes
1answer
172 views

Developer Branch vs. Feature Branch [duplicate]

I saw around that development teams usually use source control in one of 2 schemes: Either "Feature Branch", where each feature is developed in a new branch, or "Developer Branch", where each ...
10
votes
1answer
3k views

Why do Git/Mercurial repositories use less space?

I've read on several discussions here and on SO that DVCS repositories use about the same or less space than their centralised counter-parts. I may have missed it, but I haven't found a good ...
2
votes
1answer
156 views

Managing shared code in source control

Projects A and B both use library project L: Judging by what people have written about it on the web, managing this situation appears to be a headache: ...
0
votes
1answer
209 views

How do you plan releases with new features in a development / releases branch model?

We are trying to implement a branch model in Mercurial. We have read the "Successful GIT branching model" and I proposed another, based on branched version numbers. Then I ended accepting the model ...
6
votes
2answers
185 views

What is the argument for never forcing a push in a DVCS (Mercurial)?

I always preach never to force push anything, because that adds ambiguity to the repository server. In this specific example, we collaborate with a customer and they "skip a step" and force push ...
1
vote
0answers
29 views

version control (mercurial) access by subproject

I have a central codebase, from which I branch subprojects for each client. Right now I have the central codebase in mercurial repo A and client specific code in mercurial repo B, C, D... etc. I would ...
33
votes
2answers
8k views

Empirical Evidence of Popularity of Git and Mercurial

It's 2012! Mercurial and Git are both still strong. I understand the trade-offs of both. I also understand everyone has some sort of preference for one or the other. That's fine. I'm looking for ...
2
votes
3answers
564 views

Easy way to serve mercurial? [closed]

I am currently using TortoiseHg on windows. I want my server to be available automatically as it is switched on. But I need to do these: when I set up a new project, I need to enter the ...
14
votes
6answers
1k views

Should a developer be allowed to use VSS if he prefers it?

I introduced Mercurial to my department. I love it, but it is my first version control experience. I am using it with NetBeans PHP for web development. Another developer who works on internal company ...
59
votes
7answers
5k views

At what point is version control needed? [duplicate]

I work in embedded systems. Right now, my organization has two full-time programmers and two occasional programmers. It's rare that the same project is worked on by two programmers. All code is stored ...
1
vote
1answer
128 views

Should I use git and mercurial in the same directory?

I am looking for a solution for having revision control on framework code and project code at the same time. If I am using a MVC framework, there may be specific directories where I should put my ...
9
votes
3answers
3k views

Why is bitbucket popular in eastern europe? [closed]

I was looking at google trends for bitbucket and github, and it seems bitbucket leads github in Romania, Bulgaria, and Latvia. Why is this so? Are there any historical reasons for this?
11
votes
5answers
2k views

Is it a good idea to install Mercurial on your server and hg pull to deploy?

I've just started at a new job this past month and looks like they have NO source control for their code. They are relying on the backups their hosting provider takes for them. After talking a bit I ...
3
votes
4answers
929 views

Using Mercurial repository inside a Git one: Feasible? Sane?

I am thinking on creating a Mercurial repository under a Git repository. e.g. ..../git-repository/directory/hg-repo/ The 2 repositories Is it possible to manage (keeping your sanity)? How similiar ...
3
votes
1answer
236 views

How does Mercurial determine which changesets I need when I pull?

This is a question about the internal workings of Mercurial. I vaguely remember a fellow programmer explaining to me how mercurial works out which changesets differ between two repositories and that ...
6
votes
3answers
588 views

Mercurial release management. Rejecting changes that fail testing

Researching distributed source control management (specifically mercurial). My question is more or less what is the best practice for rejecting entire sets of code that fail testing? Example: A team ...
5
votes
3answers
4k views

Can you close branches in Git?

In Mercurial you can close a branch like this: hg commit --close-branch, this means the the branch will not be listed anymore but will still exist, and can still be listed if you use hg branches ...
6
votes
3answers
240 views

How do distributed version-control systems deal with fragmentation?

Here is the scenario: X is the author of a software. X releases v1.0 on an open source license on Github and moves on. People interested in the software fork and improve the software. Now there are ...
2
votes
3answers
537 views

Release Management Tools with DVCS (Mercurial)

My development team is migrating from SVN to Mercurial. Having researched DVCS best practices, it has been suggested that we develop against feature branches of the repo mainline, test them ...
15
votes
2answers
6k views

When to separate a project in multiple subprojects

I'd like to know if it makes sense to divide the project I'm working on in two repositories instead of one. From what I can say: Frontend will be written in html+js Backend in .net The backend ...
1
vote
3answers
3k views

Fixing a push to the wrong branch

I committed and pushed some changes to the wrong branch. I found a way to fix it, but it seems overly complicated. Is this really the easiest way? on the branch that you made your changes, type hg ...
24
votes
6answers
2k views

Is version history really sacred or is it better to rebase?

I've always agreed with Mercurial's mantra 1, however, now that Mercurial comes bundled with the rebase extension and it is a popular practice in git, I'm wondering if it could really be regarded as a ...
4
votes
2answers
146 views

Is it a good idea to create multiple heads with Mercurial? [closed]

I just made a commit that I want to reverse, but I want to keep the bad commit in history. So, I hg update to the previous (good) commit. Then I keep working. This leaves me with a new head: the ...
8
votes
6answers
596 views

hginit - #ifdefs ridiculous

I was reading Joel Spolsky's mercurial introduction when it struck me: "And now what they do is this: each new feature is in a big #ifdef block. So they can work in one single trunk, while ...
276
votes
10answers
31k views

I'm a Subversion geek, why should I consider or not consider Mercurial or Git or any other DVCS?

I try to understand the benefits of distributed version control system (DVCS). I found Subversion Re-education and this article by Martin Fowler very useful. Mercurial and others DVCS promote a ...
10
votes
9answers
455 views

What's the best way for me to get started using version control in an opensource project?

It was suggested that I take my project open source due to its size and my lack of skills, so I checked out Google Code, and started making a project and now it's asking me if I want the project to ...
82
votes
10answers
19k views

Why is the sudden increase in number of Git submitters on Debian popcon graph in 2010-01?

Almost every article I've read 1 comparing Git and Mercurial it seems like Mercurial has a better command line UX with each command being limited to one idea only (unlike say git checkout). But at ...
4
votes
2answers
2k views

What is the point to namespaces in branches in git?

So I mainly use Mercurial for my projects and I decided to sit down and learn all Git's shenanigans to discover if I'm in the right side (at least for me). I'm learning that git uses namespaces for ...
3
votes
2answers
4k views

How can I get rid of just the untracked files in git? [closed]

In Mercurial I can do this with the bundled Purge Extension and executing the following command: hg purge Also good to get rid of ignored files: hg purge --all I'm curious about the most ...
-2
votes
1answer
614 views

Why can Perforce be a better version control system? [closed]

I've seen some people love and some loathe Perforce. As users or administrators with experience with other version control systems (free cookie to the ones with DVCS experience [git, Mercurial]), what ...
6
votes
3answers
5k views

How to organise projects with dependencies on BitBucket?

Both Mercurial and BitBucket make one fundamental assumption: 1 repo = 1 project. If I have a project that has a dependency (a library) which is shared by many projects, this assumption gets in the ...
7
votes
3answers
2k views

Examples of non open source projects on Bitbucket or Github

Need examples to show management that these are used for source control and effectively backup of projects. They will be concerned about having their source code off-site. If there are good ...