[PD-dev] re: branch convergence

[Tim Blechmann]

> i didnt...i had changed it in my local copy. and somehow guenter
> checked it in for me, to get a fix in another file. i guess when you
> do a cvs update or diff the server stores some  data on your local
> revisions that the administrator can use via secret commands on
> sourceforge? im kind of curious myself..

from the cvs change log:
> From: carmen rocco <ix9 at users.sourceforge.net>
> To: pd-cvs at iem.at
> Date: Thu, 12 Aug 2004 06:45:40 +0000
> Subject: [PD-cvs] pd/src m_atom.c,1.1.1.2.2.3,1.1.1.2.2.4
> u_main.tk,1.1.1.4.2.12,1.1.1.4.2.13 Reply-To: pd-list at iem.at
> 
> Update of /cvsroot/pure-data/pd/src
> In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7217
> 
> Modified Files:
>       Tag: devel_0_37
> 	m_atom.c u_main.tk 
> Log Message:
> fixed_bug_in_shell
> 
> Index: u_main.tk
> ===================================================================
> RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v
> retrieving revision 1.1.1.4.2.12
> retrieving revision 1.1.1.4.2.13
> diff -C2 -d -r1.1.1.4.2.12 -r1.1.1.4.2.13
> *** u_main.tk	23 Jul 2004 08:46:40 -0000	1.1.1.4.2.12
> --- u_main.tk	12 Aug 2004 06:45:36 -0000	1.1.1.4.2.13
> ***************
> *** 268,272 ****
>       set name [format ".help%d" $doc_number]
>       toplevel $name
> !     text $name.text -relief raised -bd 2 -font
> -*-courier-bold--normal--12-* \
>       	-yscrollcommand "$name.scroll set" -background white
>       scrollbar $name.scroll -command "$name.text yview"
> --- 268,272 ----
>       set name [format ".help%d" $doc_number]
>       toplevel $name
> !     text $name.text -relief raised -bd 2 -font
> -*-tahoma---normal--12-* \
>       	-yscrollcommand "$name.scroll set" -background white
>       scrollbar $name.scroll -command "$name.text yview"
> ***************

this is a great example, why we should have a new devel branch for every
msp release ;-)

... if no one objects, i'd go back to revision 1.1.1.4.2.12 of u_main.tk

tim

-- 
mailto:TimBlechmann at gmx.de    ICQ: 96771783
http://www.mokabar.tk

After one look at this planet any visitor from outer space 
would say "I want to see the manager."
				      William S. Burroughs