Dear CJ, You wrote: > Oh boy, I'm making a pig's ear of > this now ... I thought I'd followed > the instructions. Anyone know how to recall your last > commit?
You followed instructions, how silly of you. I don't have the knowledge you see though. Here is my guess from the svn book. svn merge -c -10479 https://rosegarden.svn.sourceforge.net/svnroot/rosegarden/trunk to correct your local copy back to the last revision. svn commit -m "Undoing change committed in r10479." But I don't know what that does to your changes you have made to this point in your code. I'd imagine they would be reverted to 10478. So tread lightly. maybe make a copy of the files you eventually want to commit first before proceeding. But I really don't know much about svn. Just enough to be dangerous. Sincerely, Julie S. --- On Thu, 7/9/09, Chris Fryer <[email protected]> wrote: > From: Chris Fryer <[email protected]> > Subject: Re: [Rosegarden-devel] [Rosegarden-bugs] SF.net SVN: > rosegarden:[10479] trunk/rosegarden/src/gui/rulers > To: "Julie S" <[email protected]> > Cc: "rosegarden-devel" <[email protected]> > Date: Thursday, July 9, 2009, 4:18 PM > Oh boy, I'm making a pig's ear of > this now ... I thought I'd followed > the instructions. Anyone know how to recall your last > commit? > Chris > > On Thu, 2009-07-09 at 13:14 -0700, Julie S wrote: > > Dear Chris, > > > > I just svn 10479 and had some trouble. > > > > I tried make, ./configure, and sh bootstrap.sh and had > no joy > > > > this is what I got: > > In file included from > src/gui/rulers/ControlToolBox.cpp:22: > > src/gui/rulers/PropertyAdjuster.h:39: error: expected > ‘,’ or ‘...’ before ‘*’ token > > src/gui/rulers/PropertyAdjuster.h:39: error: ISO C++ > forbids declaration of ‘ControlMouseEvent’ with no type > > src/gui/rulers/PropertyAdjuster.h:40: error: expected > ‘,’ or ‘...’ before ‘*’ token > > src/gui/rulers/PropertyAdjuster.h:40: error: ISO C++ > forbids declaration of ‘ControlMouseEvent’ with no type > > src/gui/rulers/PropertyAdjuster.h:41: error: expected > ‘,’ or ‘...’ before ‘*’ token > > src/gui/rulers/PropertyAdjuster.h:41: error: ISO C++ > forbids declaration of ‘ControlMouseEvent’ with no type > > src/gui/rulers/ControlToolBox.cpp: In member function > ‘virtual Rosegarden::BaseTool* > Rosegarden::ControlToolBox::createTool(QString)’: > > src/gui/rulers/ControlToolBox.cpp:45: error: cannot > allocate an object of abstract type > ‘Rosegarden::PropertyAdjuster’ > > src/gui/rulers/PropertyAdjuster.h:33: > note: because the following virtual > functions are pure within > ‘Rosegarden::PropertyAdjuster’: > > src/gui/rulers/ControlTool.h:27: note: > virtual int > Rosegarden::ControlTool::operator()(double, int) > > src/gui/rulers/ControlToolBox.cpp:53: error: no > matching function for call to ‘QHash<QString, > Rosegarden::BaseTool*>::insert(QString&, > Rosegarden::ControlTool*&)’ > > /usr/include/qt4/QtCore/qhash.h:734: note: candidates > are: QHash<Key, T>::iterator QHash<Key, > T>::insert(const Key&, const T&) [with Key = > QString, T = Rosegarden::BaseTool*] > > src/gui/rulers/ControlToolBox.cpp:61: error: cannot > convert ‘Rosegarden::ControlTool*’ to > ‘Rosegarden::BaseTool*’ in return > > make: *** [src/gui/rulers/ControlToolBox.o] Error 1 > > > > Sincerely, > > Julie S. > > > > > > > > > > > > > ------------------------------------------------------------------------------ > > Enter the BlackBerry Developer Challenge > > This is your chance to win up to $100,000 in prizes! > For a limited time, > > vendors submitting new applications to BlackBerry App > World(TM) will have > > the opportunity to enter the BlackBerry Developer > Challenge. See full prize > > details at: http://p.sf.net/sfu/Challenge > > _______________________________________________ > > Rosegarden-devel mailing list > > [email protected] > - use the link below to unsubscribe > > https://lists.sourceforge.net/lists/listinfo/rosegarden-devel > > ------------------------------------------------------------------------------ Enter the BlackBerry Developer Challenge This is your chance to win up to $100,000 in prizes! For a limited time, vendors submitting new applications to BlackBerry App World(TM) will have the opportunity to enter the BlackBerry Developer Challenge. See full prize details at: http://p.sf.net/sfu/Challenge _______________________________________________ Rosegarden-devel mailing list [email protected] - use the link below to unsubscribe https://lists.sourceforge.net/lists/listinfo/rosegarden-devel
