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

learn more… | top users | synonyms

2
votes
2answers
109 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 ...
1
vote
0answers
97 views

How to break TFS or Mercurial repository in some way with a bad commit? [closed]

I'm having an internet argument about Git, in which one of the points are that even if someone does something wrong (bad reset, bad merge, pushing rewritten history upstream or something like that), ...
4
votes
1answer
203 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 ...
4
votes
1answer
117 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
59 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 ...
0
votes
1answer
141 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 ...
2
votes
1answer
123 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
115 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 ...
5
votes
2answers
154 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
25 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 ...
1
vote
1answer
111 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 ...
3
votes
2answers
148 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 ...
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 ...
3
votes
1answer
231 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 ...
10
votes
2answers
414 views

Big project layout : adding new feature on multiple sub-projects

I want to know how to manage a big project with many components with version control management system. In my current project there are 4 major parts. Web Server Admin console Platform. The web ...
4
votes
3answers
3k 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 ...
9
votes
2answers
4k 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 ...
2
votes
3answers
471 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 ...
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 ...
1
vote
3answers
2k 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 ...
8
votes
6answers
581 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 ...
9
votes
3answers
1k 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 ...
83
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 ...
6
votes
6answers
5k 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 ...
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
3k 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
546 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 ...
5
votes
2answers
700 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 ...
12
votes
5answers
507 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 ...
7
votes
3answers
1k 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 ...
5
votes
3answers
4k 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 ...
2
votes
1answer
180 views

Can DVCSs enforce a specific workflow?

So, I have this little debate at work where some of my colleagues (which are actually in charge of administrating our Perforce instance) say that workflows are strictly a process thing, and that the ...
3
votes
2answers
782 views

Can an open source solution match or surpass Team Foundation Server's features? [closed]

Team Foundation Server offers a version control system, but with many more side features, such as bug tracking, user stories, project planning, and it is all integrated into visual studio. Someone ...
10
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 ...
9
votes
2answers
466 views

Any reasons not to use multiple version control systems?

I'm working on a project which uses GIT as the main version control system for trunk, the official branches and most sub-projects/unofficial branches. As such, I want to make my own branch use GIT to ...
7
votes
2answers
792 views

Recommended methodology for working with shared libraries and Mercurial

I work in a small team of developers who all collaborate on several Zend PHP projects. We are using Mercurial with a collection of upstream repositories, as well as Jenkins for centralized testing ...
0
votes
4answers
3k views

Searching in a repository

I'm very new to source control management and one thing puzzles me: is it possible to search through the whole repository for a string? For example I'm tracking one file, which has 100 commits and I ...
23
votes
4answers
4k views

I am a git user confused by mercurial's branching. How am I supposed to track small changes?

I've always used git before, but I want to contribute to python so now I have to learn mercurial and I find it very frustrating. So, I've made a couple of small patches and I wanted to track them as ...
-1
votes
2answers
538 views

Am I shooting myself in the foot if I use Mercurial for Rails development?

I'm a Rails developer and I prefer Mercurial over Git. However, I know that the Rails community is very pro-Git. So my question is it possible that my choice of version control system would turn back ...
8
votes
2answers
253 views

What is the canonical approach to using a VCS right from a project's infancy?

Background I've used VCS (mainly git) in the past to manage many existing projects and it works great. Typically with an existing project, I would check in each change I make to the code that either ...
8
votes
1answer
483 views

Integrating different branches from external sources into a single Mercurial repository

Edit: Making this even clearer as the bounty is about to expire: is there a way of importing history (pulling from different SCM) directly into a specific branch with Mercurial? I'm currently ...
6
votes
3answers
552 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 ...
22
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 ...
10
votes
1answer
2k 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 ...
1
vote
2answers
226 views

Will the customer benefit from a DVCS in any way?

Some of us can say a Distributed Version Control System (e.g. Mercurial, git) will have a positive impact on developers only out of the experience of using one (under the right conditions: higher ...
5
votes
4answers
2k views

Subrepositories (submodules) as a dependency tracking solution - yes or no?

What do you think about SCM-based (subrepositories in mercurial, submodules in git) dependencies management? Is it definitely a good way of managing dependencies? Or definitely bad way? Should I ...
3
votes
4answers
330 views

Will adopting a DVCS mean there will be a positive impact on development speed?

I was wondering how safe is to say that —because developers are free to version and have better and more organic workflows— code will be delivered faster. A big factor here is team size of course, ...
3
votes
2answers
495 views

Are any companies moving from DVCSs to CVCSs? [closed]

Are there any actual business cases that have made any company move from a DVCS to a CVCS (regardless of whether they were on a CVCS originally)?. Other than having a closed mind and rejecting the ...