From: Tomas Doran Date: Thu, 10 Sep 2009 02:13:04 +0000 (+0000) Subject: Blargh. Merge branch deprecate_appclass_actions manually, with svn merge http://dev... X-Git-Tag: 5.80013~12 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=0e302f1c0cc944d749c9a0f5fd29275bbf5cb3e4;hp=-c;p=catagits%2FCatalyst-Runtime.git Blargh. Merge branch deprecate_appclass_actions manually, with svn merge dev.catalyst.perl.org/repos/Catalyst/Catalyst-Runtime/5.80/trunk http://dev.catalyst.perl.org/repos/Catalyst/Catalyst-Runtime/5.80/branches/deprecate_appclass_actions . after I forgot -l on svk push, but ctrl-C after the first rev meant svk had already committed a merge mark and re-merging did nothing, and removing it didn't do the right thing. Fail cake.. --- 0e302f1c0cc944d749c9a0f5fd29275bbf5cb3e4