On Sun, 2010-09-19 at 19:10 +0200, Harry van der Wolf wrote: > Hi, > > I pulled and upgraded my 2010.2 branch (in folder hugin-2010.2). Did a > change and pushed it with "hg push ssh://<user>/hgroot/hugin/hugin -b > 2010.2" to specifiy the branch. So far so good (it seemed). > I get a mail mentioning in the header: > branch: > details: > http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/c9b073555204 > changeset: 4380:c9b073555204 > > I specified a branch. Why isn't it mentioned?
The "branch:" bit is a placeholder. [0] I don't think we can display the branch name in the email header yet. > > > Then I pulled and upgraded my hugin default (in folder hugin). Did > three changes, one of them the same as in the 2010.2 branch, followed > by three commits and now I want to push them as well. However, I get: > searching for changes > abort: push creates new remote heads on branch 'default'! > (did you forget to merge? use push -f to force) > > Did I do something wrong or is this again some over anxious mercurial > warning and can I just "push -f"? > Unlike SVN, mercurial won't let you blindly push changes when other changes have been pushed changes since your last update (even if the files you changed weren't touched by anyone else). You should pull the latest changes, update, and merge your changes with the remote ones: i.e. hg pull, hg up, hg merge, check nothing was broken, and hg ci -m "Merge". -James [0] https://groups.google.com/group/hugin-ptx/msg/630ab39bb75b178d -- You received this message because you are subscribed to the Google Groups "Hugin and other free panoramic software" group. A list of frequently asked questions is available at: http://wiki.panotools.org/Hugin_FAQ To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/hugin-ptx
