Tagged Questions
128
votes
3answers
28k views
How to correctly close a feature branch in Mercurial?
I've finished working on a feature branch feature-x. I want to merge results back to the default branch and close feature-x in order to get rid of it in the output of hg branches.
I came up with the ...
112
votes
3answers
32k views
Mercurial — revert back to old version and continue from there
I'm using Mercurial locally for a project (it's the only repo there's no pushing/pulling to/from anywhere else).
To date it's got a linear history. However, the current thing I'm working on I've now ...
112
votes
5answers
15k views
Mercurial: Named Branches vs Multiple Repositories
We're currently using subversion on a relatively large codebase. Each release gets its own branch, and fixes are performed against the trunk and migrated into release branches using svnmerge.py
I ...
83
votes
4answers
10k views
Mercurial: Can I rename a branch?
We now have a "stiging" branch, where "staging" seems to be a far better semantic fit. What's a good strategy for handling this?
66
votes
3answers
23k views
best practices in mercurial: branch vs. clone, and partial merges?
...so I've gotten used to the simple stuff with Mercurial (add, commit, diff) and found out about the .hgignore file (yay!) and have gotten the hang of creating and switching between branches (branch, ...
57
votes
6answers
10k views
Backing Out a backwards merge on Mercurial
How do you reverse the effect of a merge on polarised branches without dying of agony?
This problem has been plaguing me for months and I have finally given up.
You have 1 Repository, with 2 Named ...
44
votes
2answers
5k views
Consequences of using graft in Mercurial
There've been several questions recently about skipping changes when maintaining release branches in Mercurial. For example:
Mercurial: Branch specific changes keep coming back after dummy merge
Why ...
41
votes
3answers
11k views
Why can't I push this change to my 'main' mercurial repository?
I am trying to grok Mercurial and hope I am just getting confused here!
I have a repository ('main') that I have cloned ('clone'), , both on my own machine. Both were completely in sync with each ...
41
votes
2answers
6k views
Mercurial move changes to a new branch
I have a number of changes that I committed to my local repository, but have not yet been pushed. Since on a feature is taking longer than expected, I want to swap these changes onto a named branch ...
34
votes
1answer
4k views
Managing release branches in Mercurial
Recently I switched from SVN to Mercurial. Now I wonder how to realize my intended branching work flow in Mercurial according to good practice, hoping other developers understand what happens in the ...
31
votes
4answers
3k views
Mercurial workflow for ~15 developers - Should we use named branches?
My team's just starting out with Mercurial and a central repository. We have Hudson building the tip of the "default" branch - which is basically our mainline. We had a check-in policy with our old ...
23
votes
2answers
5k views
How to move some changeset to a new branch in mercurial
I want to move a changeset from one branch to another. Basically, I currently have:
A -> B -> C -> D # default branch
And I want:
A # default branch
\-> B -> C -> D # ...
23
votes
1answer
3k views
Mercurial branching and bookmarks
I read some information about named branches and working with bookmarks. Unfortunately I still don't see a difference between them. Is there any?
Is there any difference between:
hg branch blah
hg ...
19
votes
2answers
4k views
Branching and remote heads in Mercurial
I created a new branch using this command:
hg branch new_branch
After the first commit to the new branch, the default branch becomes inactive. If this is pushed the central repository will have only ...
18
votes
1answer
9k views
How to only push to one branch in Hg?
I have a Hg repo with 3 branches in it, but two of them are inactive (since I have already merged them into my default branch). hg heads shows 3 heads, one for each branch, even though hg branches ...
