Comments on: Committing into multiple KDE branches http://blog.froglogic.com/2008/02/committing-into-multiple-kde-branches/ A company weblog Thu, 24 Jul 2008 06:09:44 +0000 http://wordpress.org/?v=2.5 By: Aron Stansvik http://blog.froglogic.com/2008/02/committing-into-multiple-kde-branches/#comment-8572 Aron Stansvik Thu, 07 Feb 2008 14:22:46 +0000 http://blog.froglogic.com/2008/02/committing-into-multiple-kde-branches/#comment-8572 Nice script! FreeBSD uses the term MFC [1] (Merged From Current) in their commit messages when it's a merge from their bleeding edge into one of their release branches. Maybe KDE should use MFT (Merged From Trunk)? Just thought it's a little more compact than "automatically merged revision" ;) [1] e.g. http://www.freebsd.org/cgi/cvsweb.cgi/src/sys/dev/arcmsr/arcmsr.c?only_with_tag=RELENG_6 Nice script! FreeBSD uses the term MFC [1] (Merged From Current) in their commit messages when it’s a merge from their bleeding edge into one of their release branches. Maybe KDE should use MFT (Merged From Trunk)? Just thought it’s a little more compact than “automatically merged revision” ;)

[1] e.g. http://www.freebsd.org/cgi/cvsweb.cgi/src/sys/dev/arcmsr/arcmsr.c?only_with_tag=RELENG_6

]]> By: Aurélien Gâteau http://blog.froglogic.com/2008/02/committing-into-multiple-kde-branches/#comment-8551 Aurélien Gâteau Thu, 07 Feb 2008 08:37:04 +0000 http://blog.froglogic.com/2008/02/committing-into-multiple-kde-branches/#comment-8551 Nice! Small nitpick: a script can't change the pwd of the calling shell (unless you run your script with ". ./ilc" instead of "./ilc"), thus it's not necessary to call "cd ${src_dir}" before calling "exit". Nice! Small nitpick: a script can’t change the pwd of the calling shell (unless you run your script with “. ./ilc” instead of “./ilc”), thus it’s not necessary to call “cd ${src_dir}” before calling “exit”.

]]>