[Bps-public-commit] RT-Extension-rt_cpan_org branch, master, updated. 992c1befb9d1492fc69fe08232d4a61075ccc8e3

[Thomas Sibley]

The branch, master has been updated
       via  992c1befb9d1492fc69fe08232d4a61075ccc8e3 (commit)
      from  3ca6bd5aa547fffe07170d5c1bf6a05aa4318a9f (commit)

Summary of changes:
 bin/pull-live | 5 -----
 1 file changed, 5 deletions(-)

- Log -----------------------------------------------------------------
commit 992c1befb9d1492fc69fe08232d4a61075ccc8e3
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Fri Apr 26 17:39:44 2013 -0700

    All "rt4" branches are merged to master, so pull-live from master
    
    Reverts 784eb98 and d55c00c.

diff --git a/bin/pull-live b/bin/pull-live
index a38bfc0..ebd461c 100755
--- a/bin/pull-live
+++ b/bin/pull-live
@@ -75,11 +75,6 @@ my %REPOS = (
     'RT-Extension-CustomizeContentType' => 'git://github.com/bestpractical/rt-extension-customizecontenttype.git',
 );
 
-# Quick hack, should be removed as soon as the rt4 branches are merged
-$REPOS{$_} .= " --branch rt4"
-    for grep { not (/RT-Extension-(?!rt_cpan_org)/ or $REPOS{$_} =~ /--branch/) }
-        keys %REPOS;
-
 my $tmp_dir = tempdir( "pull-live-XXXXX", TMPDIR => 1, CLEANUP => 1 )
     or die "Couldn't get temp dir";
 

-----------------------------------------------------------------------