Merging branches in tortoiseHg does not seem to work

Posted by Spock on Stack Overflow See other posts from Stack Overflow or by Spock
Published on 2010-12-26T10:46:47Z Indexed on 2010/12/26 10:54 UTC
Read the original article Hit count: 224

Filed under:

mercurial

|

tortoisehg

|

branching-and-merging

In a project, I have a default branch and another named branch. After a merging both branches and committing it, the graph in TortoiseHg shows that both branches have been merged. However, pushing to a remote repository (which is at the stage before branching, it only has the default branch), I get the message "abort: push creates new remote branches".

If I'm not mistaken, I'm left with one branch after merging, so why this error message? Note: the graph still shows that I have 2 heads, is it in anyway related to this?

© Stack Overflow or respective owner

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

Related posts about tortoisehg

Adding hooks to TortoiseHg

as seen on Stack Overflow - Search for 'Stack Overflow'
I am using TortoiseHg and would like to apply a hook to my repo. My repo's .hg/hgrc file is as follows: [hooks] pretxncommit = python:hg_checksize.newbinsize The thing is that I don't know where TortoiseHg's PYTHONPATH variable is set. How do I change it? Or where do I put my Python file so… >>> More
Using TortoiseHg's Repository explorer

as seen on Super User - Search for 'Super User'
Hi, I'm coming from a TortoiseSVN background and decided to give TortoiseHg a try.. One thing I got really used to with TortoiseSVN was the SVN Repo-Explorer, which worked quite similarly to Windows Explorer.. However, when I tried to use TortoiseHg's Repository Explorer, what I got was something… >>> More
tortoisehg and subrepos

as seen on Stack Overflow - Search for 'Stack Overflow'
I can't get Tortoisehg (1.0) to work with subrepos I have a directory structure like this: root .hg .hgsub .hgsubstate Customer1 Project1 .hg foo.txt Project2 .hg Customer2 Project3 .hg the .hgsub file under root looks like Customer1\Project1=Customer1\Project1… >>> More
Force an update in TortoiseHg?

as seen on Stack Overflow - Search for 'Stack Overflow'
I've pulled in some changes to read-only files from a remote repository and I'm trying to update my working area, but I get [Errno 13] ... Access is denied errors when TortoiseHg tries to update the read-only files. I can do the update from the command line using a -f, but I'm wondering if there's… >>> More
Using TortoiseHg’s Repository explorer

as seen on Stack Overflow - Search for 'Stack Overflow'
I posted this question on superuser.com but I wasn't sure if it was appropriate there.. Anyway: Hi, I'm coming from a TortoiseSVN background and decided to give TortoiseHg a try.. One thing I got really used to with TortoiseSVN was the SVN Repo-Explorer, which worked quite similarly to Windows… >>> More