subversion merge branch

Posted by in Uncategorized on Mar 23rd, 2012 | 0 comments

see: http://www.sepcot.com/blog/2007/04/SVN-Merge-Branch-Trunk

Click here to see example

Check out a copy of trunk: svn co svn+ssh://server/path/to/trunk

Check out a copy of the branch you are going to merge: svn co svn+ssh://server/path/to/branch/myBranch

Change your current working directory to “myBranch” Find the revision “myBranch” began at: svn log –stop-on-copy

This should display back to you the changes that have been made back to the point the branch was cut. Remember that number (should be rXXXX, where XXXX is the revision number).

Change your current working directory to trunk # Perform an SVN update: svn up

This will update your copy of trunk to the most recent version, and tell you the revision you are at. Make note of that number as well (should say “At revision YYYY” where YYYY is the second number you need to remember).

Now we can perform an SVN merge: svn merge -rXXXX:YYYY svn+ssh://server/path/to/branch/myBranch

This will put all updates into your current working directory for trunk. Resolve any conflicts that arose during the merge

Check in the results: svn ci -m “MERGE myProject myBranch [XXXX]:[YYYY] into trunk”

Tomcat 7 on Mac OS X

Posted by in Apache, Mac Tech on Nov 22nd, 2011 | 0 comments

Tomcat 7 install on Mac, super-easy. (Thanks to Wolf Paulus)

Download the latest Tomcat 7 binary and then:

sudo mv ~/Downloads/apache-tomcat-7.XX.XX /usr/local
sudo ln -s /usr/local/apache-tomcat-7.XX.XX /Library/Tomcat
sudo chown -R <your_username> /Library/Tomcat
sudo chmod +x /Library/Tomcat/bin/*.sh

start/stop:

/Library/Tomcat/bin/startup.sh
/Library/Tomcat/bin/shutdown.sh

Turn off hibernate on MB Air

Posted by in Uncategorized on Nov 3rd, 2011 | 0 comments

Trying to prevent wake-from-sleep issues which just started and are pretty infrequent but annoying on my otherwise much-loved MacBook Air:

sudo pmset -a hibernatemode 0

An Event Apart 2011

Posted by in HTML/JS/CSS, Mobile on Oct 31st, 2011 | 0 comments

Went to An Event Apart in DC this year and had a good time, met a lot of nice people and saw some great presentations. Nice to see the front-end developer role becoming more professionalized and really push to (continue) to make a better web.

It’s put on by the guys who do A List Apart (not surprisingly), and many of the authors of books published by the highly recommended A Book Apart participated.

One of the big themes across talks was content. How to manage it, present it, structure it, make it responsive and accessible to all. Tech-wise, there were some interesting presentations on refinements and new techniques being used in HTML5 and CSS3 and how we can be using this stuff now (again) in order to provide “progressive enhancement”.

Some notable highlights:

Andy Clarke’s presentation had more fun CSS3 animation demos – like: the-letter-heads plus some interesting thoughts on semantic markup for CSS3 animations ( view this source: view-source:http://animatable.com/demos/madmanimation/ then check out the animation )

Something you may have heard about but haven’t used yet (due to limited browser support) is Flexible Boxes see the Eric Meyer blurb on the AEA site and Google for plenty of examples. It’s something that definitely has the potential to change the approach to how we code layouts and has implications for responsive/mobile as well ( http://caniuse.com/#feat=flexbox ).

We also went to an accessibility workshop, which should be a separate internal RF workshop – we’re trying to get someone who can demo some assistive reader technologies, etc. The presenter at the conference, Derek Featherstone, is one of the leaders in accessibility, you can check out his sites for more info:
http://simplyaccessible.com/
http://furtherahead.com/

Of particular interest is how much iOS has native support for accessibility and a good way to experience a site or app is to turn on the accessibility settings like VoiceOver on iPad/iPhone and then turn on the screen curtain (triple-tap!) so you can’t cheat.

View contents of SSL certificate

Posted by in LAMP on Oct 8th, 2011 | 0 comments 
openssl x509 -in certificate.crt -text -noout

Install MS fonts on Linux

Posted by in LAMP on Oct 6th, 2011 | 0 comments

see:
http://www.techrepublic.com/blog/opensource/how-do-i-install-and-use-fonts-in-linux/238

wget http://corefonts.sourceforge.net/msttcorefonts-2.0-1.spec
 
yum install rpm-build cabextract
 
rpmbuild -ba msttcorefonts-2.0-1.spec
 
yum localinstall --nogpgcheck /usr/src/redhat/RPMS/noarch/msttcorefonts-2.0-1.noarch.rpm

I found you’ll need to edit the spec file to change the mirror location:

mirror="http://download.sourceforge.net/sourceforge/corefonts/"

« Previous Entries