Questions tagged [mercurial]
Mercurial is a fast, open-source, distributed version control system.
109
questions
5
votes
2
answers
618
views
Is switching from a CVCS to a DVCS a considerable bandwidth save?
So, I'm in a big geographically-distributed company, we use perforce and I'm starting to make the case for a DVCS with a whitepaper I was requested to write.
I was thinking that one of the arguments ...
5
votes
3
answers
862
views
Moving from a CVCS to a DVCS in a big company, what is the right way to do it?
I just started a new job and I'm currently at the process of trying to introduce a DVCS (mercurial, but the actual DVCS is not really a matter of discussion at this point, it could also be git) to the ...
5
votes
4
answers
3k
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 ...
5
votes
2
answers
1k
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 blow....
5
votes
1
answer
3k
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 ...
5
votes
3
answers
262
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 ...
5
votes
3
answers
4k
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 ...
5
votes
3
answers
744
views
How to effectively manage source control for project with both open and closed source?
I'm currently working on a project that has both an open-source "community edition" and a set of closed-source features for paying clients. One of the pain-points right now is figuring out how to ...
5
votes
1
answer
2k
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
3
answers
346
views
Which revision control system to use for 2 semester capstone course? [closed]
For CS undergraduate students working on a 2-semester capstone course without any prior exposure to revision control systems, what would be a good one to use?
Desirable qualities would be easy to ...
4
votes
7
answers
1k
views
Version control management of large projects
I'm used to version control, in particular I currently use Mercurial. I have some doubts about how to make it work in large teams, where there is a good probability of having more people working on ...
4
votes
2
answers
9k
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 practical/...
4
votes
3
answers
170
views
Where should the description about branches in a VCS be stored?
If you maintain many branches in your favorite version control system it is essential understand which branch for which indented.
In SVN you can put README on same level as trunk/branches/features ...
4
votes
6
answers
834
views
How to set up for selective pushing with Mercurial?
I have a situation, when I'm working on a project, but at same time small issues arise which require quick fix. I would like to push just the fixes for these problems to the main repo while keeping ...
4
votes
1
answer
276
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 ...
4
votes
4
answers
440
views
Understanding my dvcs workflow
We are going to be building a new project using Mercurial as our version control system.
I'm still trying to fully understand what my workflow should look like, so I've listed below a case that I ...
4
votes
2
answers
261
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 ...
4
votes
3
answers
835
views
using svn and mercurial in eclipse for same project
Is it possible to have in eclipse 2 "team providers" for same project. E.g. svn and mercurial?
So svn will be used to commit to central repository, and mercurial only to work on my PC.
E.g. when I ...
4
votes
1
answer
198
views
Switching from SVN to Mercurial: one repository or many?
We currently have a large Subversion repository, with a tree like:
root
/libraries
/library1
/trunk
/library2
/trunk
/solutions
/solution1
...
3
votes
2
answers
554
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 ...
3
votes
4
answers
365
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
3
answers
723
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 localdir=URL ...
3
votes
2
answers
1k
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 ...
3
votes
1
answer
213
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. ...
3
votes
3
answers
626
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 separately,...
3
votes
4
answers
393
views
Versioning millions of files with distributed SCM
I'm looking into the feasibility of using off-the-shelf distributed SCMs such as Git or Mercurial to manage millions of XML files. Each file would be a commercial transaction, such as a purchase order,...
3
votes
3
answers
493
views
Where to find Hg/Git technical support? [closed]
I would like to out who provides technical support (commercial) for two major DVCS's of today: Git and Mercurial.
This is for a place where they've been using Subversion for some time and now they're ...
3
votes
3
answers
8k
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 ...
3
votes
4
answers
1k
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
1
answer
576
views
Getting started with version control and its integrated project management?
I am given the charge of finding a version control + project management setup, and also training and maintenance, in addition to my regular jobs; I will be known as "the git guy" (or whatever) from ...
3
votes
4
answers
190
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 ...
3
votes
1
answer
628
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 ...
3
votes
2
answers
1k
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 ...
2
votes
2
answers
396
views
Who is the potential audience of a commit message?
I've been taking a course on plain language writing, in order to make my commit messages more readable and understandable.
One of the main ideas in plain language writing is that your first identify ...
2
votes
1
answer
229
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 ...
2
votes
1
answer
203
views
Mercurial topology in three stage implementation
A few years ago, now, we had a chap working with us who introduced the following topology for Mercurial...
The main repository server obviously holds the primary repositories, as you'd expect, but ...
2
votes
2
answers
133
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
2
answers
394
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 ...
2
votes
1
answer
194
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 ...
2
votes
2
answers
99
views
Source control approach for plugins?
I'm writing an application and a set of many small plugins—where “many” means dozens and “small” means one or two sources. It's not necessarily going to be possible to divide the plugins into neat, ...
2
votes
1
answer
317
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:
http://codingkilledthecat.wordpress.com/2012/...
1
vote
1
answer
4k
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 ...
1
vote
2
answers
281
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 ...
1
vote
1
answer
646
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 ...
1
vote
3
answers
1k
views
What to do with .git folder and data in Xcode?
I am using Hg for my development. Recently, I upgraded to Lion and Xcode 4.2 and I have created a Xcode project in my source tree. The Xcode by default uses Git and created .git folder in the project ...
1
vote
2
answers
435
views
What can be done to stop losing resources and unify Mercurial and Git? [closed]
Both Mercurial and Git were created as a replacement for the same program and to solve the same problem which you can read about in Martin Beckett's answer to How did Git and Mercurial develop so ...
1
vote
1
answer
948
views
Best practice to revive and update old branch?
I'm a solo hobbyist developer with some code hosted on Bitbucket. I use TortoiseHg client-side for managing my repo.
Back in 2013 I developed a feature on a branch but abandoned it before completion.
...
1
vote
1
answer
203
views
Using branches for a mini project or module of project: Good practice?
In my repo I have 3 closely related mini projects: 1 server and 2 clients. They are all quite small (<3 files each). Since they are so small and so closely related I just dropped them in folders in ...
0
votes
4
answers
7k
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 ...
0
votes
2
answers
386
views
Source control utilizing single, remote development server, with "local repository" not on dev's machine
We have a small team currently working on numerous projects. We originally started out as a two person team and jumped in head first without any kind of source control. We currently break numerous ...