On 30 May 2010 20:43, Harry van der Wolf <[email protected]> wrote: > Hi, > > I did a "hg pull" and got: > pulling from http://hugin.hg.sourceforge.net:8000/hgroot/hugin/hugin > searching for changes > adding changesets > adding manifests > adding file changes > added 4 changesets with 23 changes to 22 files (+1 heads) > (run 'hg heads' to see heads, 'hg merge' to merge) > > So I first did: "hg heads" and got: > changeset: 4055:23a82fc2ea3c > branch: gsoc2010_makefilelib > tag: tip > user: Florian Achleitner <[email protected]> > date: Thu May 27 22:43:21 2010 +0200 > summary: Generalize boost library inclusion, according to Thomas hints. > > changeset: 4051:2e268809e1b6 > user: harryvanderwolf <[email protected]> > date: Tue May 25 10:44:23 2010 +0200 > summary: [OSX] updated readme.txt was not pushed. Try again > > changeset: 4049:d19c70145fb1 > branch: gsoc2010_patent_free_cpm > user: Antoine > date: Mon May 24 19:03:31 2010 +0200 > summary: All Surf related parts are REMOVED from Panomatic's code. Bug > to fix : panomatic segfaults at Vigra's RGB loading. > > changeset: 4022:8c4256cbdee9 > branch: 2010.0 > user: harryvanderwolf <[email protected]> > date: Wed Mar 10 17:50:09 2010 +0000 > summary: [OSX] correct XCode project for "new" dynamic libraries > > changeset: 3990:d2fc338c87d0 > branch: 2009.4 > user: ade_br <[email protected]> > date: Mon Dec 14 21:58:31 2009 +0000 > summary: Backport pt_BR translation from trunk > > changeset: 3926:0ef30e2540fd > branch: 2009.2 > user: prokoudine <[email protected]> > date: Thu Oct 15 13:53:21 2009 +0000 > summary: Updated Russian translation for 2009.4 > > changeset: 3856:07df413df228 > branch: gsoc2008_feature_matching > user: onurcc <[email protected]> > date: Fri Aug 15 22:27:21 2008 +0000 > summary: Bug fixed about multiple kd-trees method, also added small > progress increments after each keypoint generation for an image > > changeset: 3846:1bdea5dfddaf > branch: gsoc2008_masking > user: fmannan <[email protected]> > date: Sat May 23 18:17:59 2009 +0000 > summary: +added platform/windows/autopano-mockup/CMakeLists.txt was > causing problem in previous commit > > And just like the command mentioned (run 'hg heads' to see heads, 'hg merge' > to merge), I did "hg merge" and got: > abort: branch 'default' has one head - please merge with an explicit rev > > Now should I just merge with the latest revision by Florian (GSOC 2010) or > should I merge with my own latest revison (standard trunk) or ...? > I assume I have to merge with my own revision as it is standard trunk > whereas Florian's rev is GSOC 2010 and the one before is from Antoine also > being GSOC 2010. > It is confusing though. > Does this also mean tha something has gone wrong or is this standard HG > behavior when splitting to more trees? > > Please some common comments before I (or anyone else) makes mistakes in this > process. > > Harry > > -- > 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
Hi, you don't have to merge anything. Merging is necessary when there are more heads in one branch but in this case it seems that it's multiple branches where every branch has exactly one head. Lukas -- 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
