On Sat, 2010-01-30 at 12:02 +0000, Philip Potter wrote: > On 29 January 2010 12:23, Peter Lavender <[email protected]> wrote: > > On 29 January 2010 09:08, Peter Lavender <[email protected]> wrote: > >> I do think though that it would be good to see more traffic for Padre > >> stuff > >> hit the list... the only reason I knew of Steffans branch was that I > >> caught > >> a breif mention of it in IRC either from a commit or just a simple mention > >> of it in passing. > > > > this++ > > > > I won't promise anything, but if I notice something like it again, I'll try > > to post to the list. > > Can I suggest that if/when padre-slave-driver-threads is folded into > trunk, someone announces it here so that I know to switch over?
Have you switched to the branch yet? If so, then it's just a case of switching back to trunk using the same process, only pointing to trunk rather than the branch. > Or > will svn sort it all out for me? (I'm normally a git user myself..) You will need to switch back to trunk if you have changed to the branch, or if like a few of us you're still on trunk, then just wait for the merge to be done and svn update trunk and you should be right. If don't get the timing right though you may find you have a broken trunk for a while.. so I think the best thing to do will be to have Steffan announce in the list that he's ( or who ever is going to do it ) has merged the branch. Pete.
_______________________________________________ Padre-dev mailing list [email protected] http://mail.perlide.org/mailman/listinfo/padre-dev
