On Wed 16-Dec-2009 at 22:05 +0000, James Legg wrote: >> Now the reason why I think we need to branch sooner is that the >> layout stuff urgently needs to be merged with the trunk. There have >> been a lot of changes in the trunk and the merge is going to be >> a bit 'hairy', we might have to back-out some of the recent string >> changes temporarily to get it in. >> >> James would you like to do this merge or shall I? > >I could give it a go.
This probably isn't as bad as it looks, but 29 conflicts is still a lot work to resolve, as time passes it is going to get more difficult to merge the layout branch: 1 out of 10 hunks FAILED -- saving rejects to file src/hugin1/hugin/AssistantPanel.cpp.rej 1 out of 1 hunk FAILED -- saving rejects to file src/hugin1/hugin/CMakeLists.txt.rej 1 out of 6 hunks FAILED -- saving rejects to file src/hugin1/hugin/CPEditorPanel.cpp.rej 1 out of 4 hunks FAILED -- saving rejects to file src/hugin1/hugin/CropPanel.cpp.rej 1 out of 13 hunks FAILED -- saving rejects to file src/hugin1/hugin/ImagesList.cpp.rej 1 out of 14 hunks FAILED -- saving rejects to file src/hugin1/hugin/ImagesPanel.cpp.rej 2 out of 4 hunks FAILED -- saving rejects to file src/hugin1/hugin/ImagesPanel.h.rej 1 out of 23 hunks FAILED -- saving rejects to file src/hugin1/hugin/LensPanel.cpp.rej 1 out of 3 hunks FAILED -- saving rejects to file src/hugin1/hugin/MainFrame.cpp.rej 1 out of 23 hunks FAILED -- saving rejects to file src/hugin1/hugin/OptimizePanel.cpp.rej 1 out of 4 hunks FAILED -- saving rejects to file src/hugin1/hugin/OptimizePanel.h.rej 1 out of 10 hunks FAILED -- saving rejects to file src/hugin1/hugin/OptimizePhotometricPanel.cpp.rej 1 out of 17 hunks FAILED -- saving rejects to file src/hugin1/hugin/wxPanoCommand.cpp.rej 1 out of 4 hunks FAILED -- saving rejects to file src/hugin1/hugin/xrc/images_panel.xrc.rej 1 out of 2 hunks FAILED -- saving rejects to file src/hugin_base/hugin_math/hugin_math.h.rej 1 out of 3 hunks FAILED -- saving rejects to file src/hugin_base/nona/ImageRemapper.h.rej 2 out of 28 hunks FAILED -- saving rejects to file src/hugin_base/panodata/Panorama.cpp.rej 3 out of 5 hunks FAILED -- saving rejects to file src/hugin_base/panodata/SrcPanoImage.cpp.rej 4 out of 8 hunks FAILED -- saving rejects to file src/hugin_base/panodata/SrcPanoImage.h.rej 1 out of 10 hunks FAILED -- saving rejects to file src/hugin_base/panotools/PanoToolsInterface.cpp.rej 1 out of 2 hunks FAILED -- saving rejects to file src/hugin_base/panotools/PanoToolsInterface.h.rej -- Bruno -- 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
