On 28 Feb., 22:54, Bruno Postle <[email protected]> wrote:
> If you are working with HG, you should be able to just pull updates > from the 'default' branch and never worry that your branch is > diverging. I do worry about 'my' branch diverging. There are some bugs in the python_scripting branch that have been in it since it was started by Pablo. I have so far made an effort to only do hg exports from my local copy, basing my changesets on a pull from the SF repo with my newest changes committed to that. Maybe I'm suffering from a misconception here. Can I just merge the default branch into the python_scripting branch to bring it up-to-date with the default branch? I'd then have to do an hg bundle to export the changeset resulting from two parents, but the python_scripting branch would be up-to-date again. I wanted to keep it simple, but maybe I did the wrong thing and it's my fault having let the branches diverge so far. Please excuse my ignorance in these matters, I still haven't totally gotten my head round mercurial. Kay -- 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
