@@ -12,7 +12,12 @@ task :commit => "svn:st" do if files_to_check_in? commit_message = CommitMessage.new.prompt Rake::Task[:pc].invoke - sh "#{commit_command(commit_message)}" if ok_to_check_in? + + if ok_to_check_in? + output = sh_with_output "#{commit_command(commit_message)}" + revision = output.match(/Committed revision (\d+)\./)[1] + merge_to_trunk(revision) if `svn info`.include?("branches") && self.class.const_defined?(:PATH_TO_TRUNK_WORKING_COPY) + end else puts "Nothing to commit" end @@ -39,4 +44,12 @@ def are_you_sure?(message) input = Readline.readline("Are you sure you want to check in? (y/n): ") end return input.strip.downcase[0,1] == "y" -end \ No newline at end of file +end + +def sh_with_output(command) + puts command + output = `#{command}` + puts output + raise unless $?.success? + output +end tasks/commit.rake @@ -54,5 +54,11 @@ namespace :svn do rm_r filename end end + + def merge_to_trunk(revision) + puts "Merging changes into trunk. Don't forget to check these in." + sh "svn up #{PATH_TO_TRUNK_WORKING_COPY.inspect}" + sh "svn merge -c #{revision} . #{PATH_TO_TRUNK_WORKING_COPY.inspect}" + end end tasks/svn.rake aa597bca6ccf5068785edbe0402f59fad4e085b3 Paul Gross pgr0ss pgross@gmail.com http://github.com/pgr0ss/rake_commit_tasks/commit/66a3a4867e8141345c4490d7725d7b82067d9c43 66a3a4867e8141345c4490d7725d7b82067d9c43 2009-02-19T21:36:04-08:00 2009-02-19T21:36:04-08:00 Automatically merge changes from branch to trunk if PATH_TO_TRUNK_WORKING_COPY is set 46dfaf1b1246b462292c71bab99812f613658d9e Paul Gross pgr0ss pgross@gmail.com