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

Tom

unread,

May 29, 2010, 1:10:03 PM5/29/10

to jfxtr...@googlegroups.com

Why am I getting this error message (abort: push creates new remote
heads on branch 'default'!)? I just did a pull, nothing comes in, put I
cannot push my commits.

Tom

David Armitage

unread,

May 29, 2010, 4:55:14 PM5/29/10

to jfxtr...@googlegroups.com

Probably nothing to do with it, but I couldnt Push, and then I discovered that something had changed my @ in the dnarmitage@googlemail in the addresses to %2540 rather than %40 as though it was double escaping.

Changed back and worked OK. Starangely, I suppose because not bothered about the ID, pulls worked.

Cheers,

David

Stephen Chin

unread,

May 30, 2010, 1:26:02 AM5/30/10

to jfxtr...@googlegroups.com

You might need to do a merge.

--
--Steve
blog: http://steveonjava.com/

Tom

unread,

May 30, 2010, 2:52:00 AM5/30/10

to jfxtr...@googlegroups.com

I did not find a merge option in TortoiseHG, nor do I get a list of
files that need merging (like you get in Subversion).
Since I only modified the light skin of calendarpicker for this commit,
I'm also confused what may have triggered this need to merge.

Tom

unread,

May 30, 2010, 3:21:03 AM5/30/10

to jfxtr...@googlegroups.com

On 2010-05-30 07:26, Stephen Chin wrote:

> You might need to do a merge.

Apparently I have branched something without knowing. Hm. I'm pretty
sure I just changed, committed and pushed.

Dean Iverson

unread,

May 30, 2010, 8:58:58 AM5/30/10

to jfxtr...@googlegroups.com

Tom,

Sounds more likely that you pulled changes previously but didn't merge them. There is a good explanation of this here:

http://hginit.com/04.html

Dean

--
You received this message because you are subscribed to the Google Groups "JFXtras Developers" group.
To post to this group, send email to jfxtr...@googlegroups.com.
To unsubscribe from this group, send email to jfxtras-dev...@googlegroups.com.
For more options, visit this group at http://groups.google.com/group/jfxtras-dev?hl=en.

Tom

unread,

May 30, 2010, 11:04:50 AM5/30/10

to jfxtr...@googlegroups.com

Unless someone hacked around in the CalendarPicker code, that would be very unlikely.

In the little graph I saw that I had committed at the head (31) of my own repository, but also branched of some 7 revisionnr's back (24ish). I had to merge that branch to the head and then the graph showed a line from that branch merging into the head. I would like to understand where that branch came from. I think I was quit innocent.

Tom

Johannes Schneider

unread,

May 31, 2010, 3:53:53 AM5/31/10

to jfxtr...@googlegroups.com

Could you post the output of hg glog

>> <mailto:jfxtr...@googlegroups.com>.

>> To unsubscribe from this group, send email to
>> jfxtras-dev...@googlegroups.com

>> <mailto:jfxtras-dev%2Bunsu...@googlegroups.com>.

>> For more options, visit this group at
>> http://groups.google.com/group/jfxtras-dev?hl=en.
>>
>>
>> --
>> You received this message because you are subscribed to the Google
>> Groups "JFXtras Developers" group.
>> To post to this group, send email to jfxtr...@googlegroups.com.
>> To unsubscribe from this group, send email to
>> jfxtras-dev...@googlegroups.com.
>> For more options, visit this group at
>> http://groups.google.com/group/jfxtras-dev?hl=en.
>
> --
> You received this message because you are subscribed to the Google
> Groups "JFXtras Developers" group.
> To post to this group, send email to jfxtr...@googlegroups.com.
> To unsubscribe from this group, send email to
> jfxtras-dev...@googlegroups.com.
> For more options, visit this group at
> http://groups.google.com/group/jfxtras-dev?hl=en.

--
Johannes Schneider - blog.cedarsoft.com

Tom

unread,

Jun 1, 2010, 4:05:57 AM6/1/10

to jfxtr...@googlegroups.com

Ermmmm

C:\Program Files\TortoiseHg>hg glog
hg: unknown command 'glog'
Mercurial Distributed SCM

Johannes Schneider

unread,

Jun 1, 2010, 4:51:58 AM6/1/10

to jfxtr...@googlegroups.com

On 06/01/2010 10:05 AM, Tom wrote:
> Ermmmm
>
> C:\Program Files\TortoiseHg>hg glog
> hg: unknown command 'glog'
> Mercurial Distributed SCM

Yeah, need that extension:
http://mercurial.selenic.com/wiki/GraphlogExtension

Sorry,

Johannes

Tom

unread,

Jun 8, 2010, 2:41:18 AM6/8/10

to jfxtr...@googlegroups.com

On 1-6-2010 10:51, Johannes Schneider wrote:
> On 06/01/2010 10:05 AM, Tom wrote:
>
>> Ermmmm
>>
>> C:\Program Files\TortoiseHg>hg glog
>> hg: unknown command 'glog'
>> Mercurial Distributed SCM
>>
> Yeah, need that extension:
> http://mercurial.selenic.com/wiki/GraphlogExtension
>
>
> Sorry,
>
> Johannes
>
>

Ok then, so what I need to understand is why changeset 23:602e9d69084c
was considered a branch. However, what I do not see is that, before
merging, I had changes in a branch and in the main line, like this:

I had to merge my own files, so some how they got branched.

Stephen Chin

unread,

Jun 8, 2010, 4:04:36 AM6/8/10

to jfxtr...@googlegroups.com

Here is the most likely scenario that caused this (with changelists in brackets):

hg commit [23]
hg update -u [gets 24-29] (pulls in external changes, creating a branch)
<missing step> should run "hg merge" here
hg commit [30, 31] (now committing on branch)
hg merge; hg commit [32]

The message after doing the update in step 2 will recommend you run a merge, which would avoid the branch propagation. Doing a merge after subsequent commits (as it appears you did in step 5) is harmless as long as you don't have conflicting changes.

Cheers,
--Steve

Tom

unread,

Jun 8, 2010, 4:14:41 AM6/8/10

to jfxtr...@googlegroups.com

So... Synchronizing the repository and then doing an update to get the changes in my sources is not enough; it can still result in a branch, even if no one else is modifying these specific source files.

<confused look/>
<head scratching/>

It will most certainly will start making sense in the (hopefully not too distant) future, for now I will try harder not too miss merge messages.

Thanks!

Stephen Chin

unread,

Jun 8, 2010, 4:27:16 AM6/8/10

to jfxtr...@googlegroups.com

The modified files don't matter when considering if a merge is required, therefore the following workflow is extremely common:

hg pull -u
hg merge
hg commit -m "Merged changes"

In fact, this is so common that they have a "fetch" extension that automates this:
http://hgbook.red-bean.com/read/a-tour-of-mercurial-merging-work.html
(see section entitled "Simplifying the pull-merge-commit sequence")

Cheers,
--Steve

--
You received this message because you are subscribed to the Google Groups "JFXtras Developers" group.
To post to this group, send email to jfxtr...@googlegroups.com.
To unsubscribe from this group, send email to jfxtras-dev...@googlegroups.com.
For more options, visit this group at http://groups.google.com/group/jfxtras-dev?hl=en.

Tom

unread,

Jun 8, 2010, 4:43:59 AM6/8/10

to jfxtr...@googlegroups.com

Ok, I see. Luckily TortoiseHG also has a fetch feature in the synchronize window.

Reply all

Reply to author

Forward