[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. puppet-0.24.5-rc3-1456-g2f0b1e5

[James Turnbull]

The following commit has been merged in the upstream branch:
commit 2283605ba63b39deec30bd71b5d0879630f63e6d
Author: James Turnbull <james at lovedthanlost.net>
Date:   Thu Sep 17 12:47:27 2009 +1000

    Added automatically constructed test branch task and file

diff --git a/.testseries b/.testseries
new file mode 100644
index 0000000..0d8969b
--- /dev/null
+++ b/.testseries
@@ -0,0 +1 @@
+tickets/master/2239
diff --git a/tasks/rake/testbranch.rake b/tasks/rake/testbranch.rake
new file mode 100644
index 0000000..62304ea
--- /dev/null
+++ b/tasks/rake/testbranch.rake
@@ -0,0 +1,16 @@
+desc "Rebuild the 'test' branch"
+task :testbranch do
+    TEST_SERIES = %x{git config --get puppet.testseriesfile}.chomp
+
+    sh 'git checkout master'
+    if %x{git branch}.split("\n").detect { |l| l =~ /\s+test$/ }
+        sh 'git branch -D test'
+    end
+    sh 'git checkout -b test'
+    File.readlines(TEST_SERIES).each do |line|
+        line.chomp!
+
+        # Always create a commit for our merge
+        sh "git merge --no-ff #{line}"
+    end
+end

-- 
Puppet packaging for Debian