Re: java_new deprecated + fix

[Jordi Gutiérrez Hermoso]

On 13 December 2012 16:45, Philip Nienhuis <address@hidden> wrote:
> abort: push creates new remote head b536287efd4e!

The problem here is that your commit is based on revision, say, 5, but
between the time you created that commit and the time that you tried
to push, revisions 6, 7, and 8 have been added in Savannah. If you try
to push now, there will be an extra head in Savannah branching off
from revision 5. This isn't a great tragedy, but we can avoid this
branching and keep the history linear, which is usually preferrable
when it's easy to do so.

Rebase your commit from revision 5 to revision 8 before pushing.
Enable the rebase extension and do

If you haven't already pulled:

   hg pull --rebase

If you have already pulled, pull again anyways just to make sure there
isn't anything extra and rebase:

   hg pull
   hg rebase --source b536287efd4e --destination default

Let me know if that helps.

- Jordi G. H.