How can I merge 2 branches in my local repository

Posted by michael on Stack Overflow See other posts from Stack Overflow or by michael
Published on 2010-05-06T04:57:16Z Indexed on 2010/05/06 5:08 UTC
Read the original article Hit count: 221

Filed under:

hg

|

mercurial

|

merge

Hi,

I have 2 branches in my hg repository: 1. default 2. new-feature

I tried following this: http://mercurial.selenic.com/wiki/NamedBranches, I switch back to default by 'hg update -c default' but how can I merge my commits in 'new-feature' to 'default'.

I did "hg pull new-feature", it said "repository new-feature not found"!

Thank you.

© Stack Overflow or respective owner

Related posts about hg

Creating an SMF service for mercurial web server

as seen on Oracle Blogs - Search for 'Oracle Blogs'
I'm working on a project at the moment, which has a number of contributers. We're managing the project gate (which is stand alone) with mercurial. We want to have an easy way of seeing the changelog, so we can show management what is going on. Luckily mercurial provides a basic web server… >>> More
Mercurial branching a branch doesn't display right in hg serve or hg view

as seen on Stack Overflow - Search for 'Stack Overflow'
I've been doing some development on a branch and realized that before it could be complete something else need to be done first. I decided that I would branch my current branch and do the requiste changes in that branch then merge them back together and then merge my working branch into default. Basically… >>> More
hg command to see the changeset prior to an hg fetch

as seen on Stack Overflow - Search for 'Stack Overflow'
What mercurial command can you use to see the changeset prior to changeset xyz? If you do hg log -r :xyz you see all the changesets prior to (and including) xyz - listed in ascending order. But I'd like to easily see just the prior changeset. Update: Really what I'm after is: If I do an hg fetch… >>> More
In Mercurial, what is the exact step that Peter or me has to do so that he gets back the rolled back

as seen on Stack Overflow - Search for 'Stack Overflow'
The short question is: if I hg rollback, how does Peter get my rolled back version if he cloned from me? What are the exact steps he or me has to do or type? This is related to http://stackoverflow.com/questions/3034793/in-mercurial-when-peter-hg-clone-me-and-i-commit-and-he-pull-and-update-he-g The… >>> More
Mercurial hg Subrepository Problem - "abort: unknown revision'

as seen on Stack Overflow - Search for 'Stack Overflow'
Note: I asked this yesterday over at kiln.stackexchange.com, but haven't gotten an answer, and it's holding up my work. So I figured I'd give it a shot here. My main mercurial repository has a bunch of subrepositories in it. During initial setup, I made a mistake in my .hgsub. Namely, I pointed two… >>> More

Related posts about mercurial

Mercurial fails while commiting/updating/etc. using Mercuriual+TrueCrypt+MAC

as seen on Stack Overflow - Search for 'Stack Overflow'
While trying to work with Mercurial on project located on TrueCrypt partition I always get en error as follows: ** unknown exception encountered, details follow ** report bug details to http://mercurial.selenic.com/bts/ ** or [email protected] ** Mercurial Distributed SCM (version 1.5.2+20100502) **… >>> More
OS X, Mercurial and MediaTemple problem

as seen on Stack Overflow - Search for 'Stack Overflow'
I've installed Mercurial per MT's knowledge base file here. Working with it server side using ssh from my Mac works fine. I can initialize repositories and the like, but pulling from the server or pushing from my Mac produces an error I don't understand. Here's what I get when call hg push from… >>> More
Mercurial to Mercurial to Subversion Workflow Problem

as seen on Stack Overflow - Search for 'Stack Overflow'
We're migrating from Subversion to Mercurial. To facilitate the migration, we're creating an intermediate Mercurial repository that is a clone of our Subversion repository. All developers will be begin switching over to the Mercurial repository, and we'll periodically push changes from the intermediate… >>> More
How do I configure Mercurial to use environment variables in mercurial.ini

as seen on Stack Overflow - Search for 'Stack Overflow'
How can I modify the mercurial.ini file to include an environment variable such as %userprofile%. Specific situation: I am learning to use Mercurial. I have modified the [ui] section of Mercurial.ini (in my home path) to include: ignore = c:\users\user\.hgignore Where user is my username literal… >>> More
Mercurial: Problem converting Windows cvs repository to mercurial

as seen on Stack Overflow - Search for 'Stack Overflow'
I’m trying to convert an existing Windows CVS repository to Mercurial and getting the following response and error: C:\Windows\system32>hg convert c:\users\jeff\webs\shelter-cvs\shelter assuming destination shelter-hg initializing destination shelter-hg repository connecting to :local:c:\cvs abort:… >>> More