Just merge feature-branch into default then close feature-branch: $ hg checkout default $ hg merge feature-branch $ hg commit $ hg checkout feature-branch $ hg commit –close-branch There is no more clean and sensible way (that I’m aware of) to “make feature-branch the default”. One thing that wouldn’t be as nice, but you could do, … Read more
First, I highly recommend A Guide to Branching in Mercurial Next, you could push just the current branch: Nudge – A Gentler Version of Push And maybe you could decide to allow only a head per branch: 32. Prevent a push that would create multiple heads Other SO questions related to named branches: Mercurial: Named … Read more
No, they will not be gc’s because they’re not wholly unreferenced even if you delete your branch. Github creates a branch (actually, two) for every pull request. They’re in a non-default namespace so you dont usually get them when you pull (or fetch) from the repo. To see how this looks in practice, do a … Read more
The mercurial API allows it: from mercurial import ui, hg, node peer = hg.peer(ui.ui(), {}, ‘http://hg.python.org/cpython’) for name, rev in peer.branchmap().items(): print(name, node.short(rev[0])) The above snippet produces: default aaa68dce117e legacy-trunk b77918288f7d 3.2 4787b9b2f860 3.0 4cd9f5e89061 3.1 5a6fa1b8767f 2.3 364638d6434d 2.2 61b0263d6881 2.1 e849d484029f 2.0 5fd74354d73b 2.7 260f3ad7af4b 2.6 f130ce67387d 2.5 b48e1b48e670 2.4 ceec209b26d4
Git does not have branch specific permissions. You can either make the whole repository read only to the people or create one private and one public repository and only push the development branch to the public on while keeping the master only in your private repository. Edit: For branch specific permissions, you need a server-side … Read more
mygithub/master is a remote branch. To create a local branch based off of that remote branch, you have to use git checkout -b mymaster mygithub/master. Git tries to make this easy for you: if you write git checkout branchname, and branchname only exists in a remote, but not locally, Git will automatically set up a … Read more
Yes you can, but this is not documented anywhere. I’ve used this technique for a long time, don’t worry, it is safe. Instead of updating, you can issue the following commands hg debugsetparent <revision> hg branch <branchOfRevision> Note that the order is important. This will make your repo think it is on the new revision, … Read more
You can do this, if the remote repository accepts forced pushes: git push –force origin clean_start:master Note that if anyone else has the repository cloned, a push from them could potentially undo this. If you want to merge your local master branch and the remote master branch, but keep the file tree from your branch … Read more
If you haven’t committed yet, you can simply do a clean reset as per the manual (http://www.selenic.com/mercurial/hg.1.html#commands): hg branch -C This will reset the working directory’s branch name to the parent of the branch that you just created.
We struggled with this issue for few weeks and we finally got it solved. In our case, we worked on a branch that was merged with all trunk revisions on a daily basis. When we tried to reintegrate it (merge back to trunk) we got this error. When we tried to merge the missing ranges … Read more