Re: java_new deprecated + fix

[Philip Nienhuis]

Jordi Gutiérrez Hermoso wrote:
> On 13 December 2012 16:26, Philip Nienhuis<address@hidden>  wrote:
> > I cannot push now (my working dir got mixed up), can you please fix this?
> > Changeset attached
>
> If you can produce a cset, you can push. Your working directory is
> irrelevant for the push. Do "hg outgoing" to verify that you're
> pushing the right thing, and replace "outgoing" with "push" to
> actually do it.

Thanks.
I got this:

address@hidden octave]$ hg outgoing
comparing with http://www.octave.org/hg/octave
real URL is http://hg.savannah.gnu.org/hgweb/octave
searching for changes
changeset:   15779:b536287efd4e
user:        Philip Nienhuis <address@hidden>
date:        Thu Dec 13 22:14:36 2012 +0100
summary:     java_new.m: can also have only one argument

address@hidden octave]$ hg -v push
pushing to http://www.octave.org/hg/octave
real URL is http://hg.savannah.gnu.org/hgweb/octave
searching for changes
new remote heads on branch 'default'
new remote head b536287efd4e
abort: push creates new remote head b536287efd4e!
(did you forget to merge? use push -f to force)

(I did a hg -v merge just a few minutes before.)

So what should I do?

P