How to re-base in the TortoiseHg

Topics: Administration
Mar 5, 2011 at 4:08 AM

I committed and got a changeset but forgot "Push" when sumbitting a patch.

But now when I try to "Push", I get an error:

abort: push creates new remote heads on branch 'default'!

I tried to find a resolution by Google and think I need "rebase", because currently I have "synchronize" and "accept" some NEW changeset others and I have more than one changeset that have been committed but not pushed. Here is the detail:

  1. I click "Determine and mark outgoing changeset" on TortoiseHg Explore and there are many changesets are marked by an "upper arrow Icon", which I think means they are not been pushed, right?
  2. I find there is a "Push  to here" when right clicking on one of them, so I did it. However, doing so can't resolve this problem. 

There is option of "force pull or push", but I didn't try because I'm afraid I make matters worse.

If need rebase, can I do it on TortoiseHg Explore, how?

Thanks very much in advance.

Mar 7, 2011 at 5:50 PM


I received the patch. What went wrong was, you merged the contributions and indexing branches. As a contributor you don't need to make any merges, merging will be taken care of by us. In other words, please use only the contributions branch, and make sure it only includes the code for the specific fix/feature you are developing.

I sent more details as a response to the patch.