Dear Chris,
In Revision 9173 you wrote:
> Log Message:
> -----------
>
> * re-fix line that conflicted between rival commits
>
pertaining to:
> - procArgs << file->objectName();
> + procArgs << file->fileName();
Good catch! Sorry about that.
I tried to commit straight up and it wouldn't take. I usually just cut and
paste my changes into the latest version, but I had more than usual.
I used Kompare om my version and the latest in svn. I guess there was no way
of knowing without closer scrutiny. Kompare was a better choice than my old
method, but it wasn't fool proof--I see.
I will look more closely at errors like that in the future. I think the big
things was we happened to be working in similar sections of code.
I'll look (more closely) before I leap next time.
Sincerely,
Julie S.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Rosegarden-devel mailing list
[email protected] - use the link below to unsubscribe
https://lists.sourceforge.net/lists/listinfo/rosegarden-devel
