On Mon, Dec 29, 2008 at 12:37 PM, Julie S <[email protected]> wrote:
> Chris wrote:
>> (I didn't use any magic here, I just ran svn log | more on the qt4
>> branch and kept paging through until I hit the first "merge from
>> trunk" comment.)
>
> I figured svn had some magic in it.
Svn doesn't have any magic to do with merging. In fact it doesn't
know that a particular commit is a merge at all, because the merge
happens on update rather than on commit. The commit that follows a
merge may contain the whole merge, or only part of it (if there were
failures or conflicts), or any amount of other changes as well, and
Subversion keeps no records about it.
This is one of the main omissions in Subversion and its absence is one
of the reasons that some projects with many developers (e.g. the Linux
kernel) prefer not to use it. It means, for example, that you can't
merge more than once from a given branch to any other branch without
some manual intervention (in Subversion's case, this means keeping
your own record of the start and end revisions to be merged) with its
associated risk of serious errors.
Distributed version control systems like git, darcs or Mercurial
handle merges natively, but so do more sophisticated centralised
systems like ClearCase or Perforce. You could call Subversion a tidy
modern implementation of a rather old-fashioned design. I'm fond of
it, but it has its limitations.
Anyway, having said all that, our situation is not all that
complicated and we're careful enough about our commit messages to make
it quite feasible to deal with this by hand.
> Is there a debugging tool that you folks recommend? What are folks doing to
> set break points, watches, etc.?
I just use gdb at the command line. It has serious limitations for C++ though.
Here's a recent development that looks very promising -- not a
debugger (it also just uses gdb) but as the prospect of an IDE that
works really well for Qt:
http://trolltech.com/developer/qt-creator
It only handles relatively simple qmake-based projects so far, but
they promise to add support for CMake projects and plain Makefiles.
It would be terrific to be able to supply an unambiguous
recommendation for the question of "which IDE to use".
Chris
------------------------------------------------------------------------------
_______________________________________________
Rosegarden-devel mailing list
[email protected] - use the link below to unsubscribe
https://lists.sourceforge.net/lists/listinfo/rosegarden-devel
