Contents

#!/usr/bin/env ruby
begin
  require 'rubygems'
  gem 'bnr_tools'
rescue LoadError
  $: << File.expand_path(File.dirname(__FILE__)) + "/../lib"
end

require 'bnr_tools'
require 'mergeinator'
require 'ticket'
require 'trollop'

CURRENT_RELEASE_BRANCH="9.4"

opts = Trollop::options do
  opt :ticket, "A ticket number optionally followed by one or more changesets to merge", :type => :ints, :multi => true
  opt :wc_root_path, "Root path to a working copy of the repository we can do merge gymnastics in", :default => "#{ENV["HOME"]}/diggRepository"
  opt :release_branch, "Name of the release branch which will be the merge target", :default => CURRENT_RELEASE_BRANCH, :required => true, :multi => true  
end

tickets = Set.new
Array(opts[:release_branch]).each { |release_branch|
  opts[:ticket].each { |ticketRefAndChangesets|
    ticket, *changesets = *ticketRefAndChangesets
    tickets << Ticket.new(ticket, changesets, opts[:wc_root_path], release_branch)
  }
  Mergeinator.new(opts[:wc_root_path], release_branch, tickets).mergeStuff
}

Version data entries

3 entries across 3 versions & 1 rubygems

Version	Path
motomike-bnr_tools-0.0.3	bin/taggit
motomike-bnr_tools-0.0.4	bin/taggit
motomike-bnr_tools-0.0.5	bin/taggit