Il giorno giovedì 2 gennaio 2014 10:07:47 UTC+1, T. Modes ha scritto: > > > I'm trying to commit an updated italian translation but the commit is >> aborted with the following message: >> abort: push creates new remote branches: 2014.0! >> Never had this problem, what should i do to commit? >> > > First pull all new changesets from public repository (hg pull). Then do a > "hg merge" to merge the 2 heads (then you have maybe do a commit of the > merge with 'hg commit -m "Merged"). After it you should be able to do a hg > push. > > see e.g. http://mercurial.selenic.com/wiki/TutorialMerge > > Thomas >
Thanks for the help but I'm still stuck... I started from scratch by freshly cloning the hugin repo, I made only a small modification to a single string in the it.po file, then commit and then push all while in "default" branch. I got the message above: abort: push creates new remote branches: 2014.0! If I run hg merge i got this: aborted: branch 'default' has one head - please merge with an explicit rev (run 'hg heads' to see all heads) -- A list of frequently asked questions is available at: http://wiki.panotools.org/Hugin_FAQ --- You received this message because you are subscribed to the Google Groups "hugin and other free panoramic software" group. To unsubscribe from this group and stop receiving emails from it, send an email to hugin-ptx+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/hugin-ptx/92cc66fb-25fc-4e9c-8da0-8b628fdceb4a%40googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
