Questions tagged [mercurial]
Mercurial is a fast, open-source, distributed version control system.
109 questions
0
votes
2
answers
4k
views
Why does Meta (Facebook) use mono-repo in their source control? [closed]
Meta maintains all their code in a single repository and initially used Git. Due to performance issues attributed to the repo's size, they consulted Git's team, who suggested switching to a multi-repo ...
-2
votes
1
answer
111
views
How can I get back to having only the master bookmark in Mercurial?
I am very confused in what I did with this mercurial repository ... I reversed a commit and after that I was never able to have a "unique" structure in my repository again. Can someone help me?
> ...
0
votes
2
answers
327
views
Source Control Release Management: Simultaneous Releases with Different Configurations
This is a best practices question for release management of an app. But this scenario is a bit different than what I've been able to find myself.
Essentially my company maintains a fork of its own ...
1
vote
1
answer
982
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.
...
6
votes
1
answer
306
views
Mercurial: tracking several repositories with same versioning
I am using mercurial on my project.
Now I face following problem: I have two separate mercurial repositories with their own history. Now I need to have identical branches/bookmarks for both of them.
...
3
votes
1
answer
667
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 ...
14
votes
5
answers
5k
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
2
answers
420
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 ...
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 ...
1
vote
1
answer
695
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 ...
2
votes
1
answer
335
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/04/...
6
votes
2
answers
266
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 ...
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 ...
4
votes
1
answer
281
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 ...
5
votes
3
answers
269
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 ...
3
votes
3
answers
651
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
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 ...
18
votes
3
answers
3k
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 ...
28
votes
6
answers
25k
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 control ...
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/...
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....
8
votes
3
answers
4k
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 ...
2
votes
1
answer
240
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 ...
13
votes
5
answers
3k
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 ...
7
votes
2
answers
1k
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 ...