Sha256: 41e5e3649fb79218f6c1a2caf45530f0186d253da3ebd025a769f2b30126134d
Contents?: true
Size: 1.02 KB
Versions: 26
Compression:
Stored size: 1.02 KB
Contents
#!/usr/bin/env ruby
require File.dirname(__FILE__) + '/../test_helper'
class TestEachConflict < Test::Unit::TestCase
def setup
set_file_paths
#@git = Git.open(@wdir, :log => Logger.new(STDOUT))
@git = Git.open(@wdir)
end
def test_conflicts
in_temp_dir do |path|
g = Git.clone(@wbare, 'branch_merge_test')
Dir.chdir('branch_merge_test') do
g.branch('new_branch').in_branch('test') do
new_file('example.txt', "1\n2\n3")
g.add
true
end
g.branch('new_branch2').in_branch('test') do
new_file('example.txt', "1\n4\n3")
g.add
true
end
g.merge('new_branch')
begin
g.merge('new_branch2')
rescue
end
g.each_conflict do |file, your, their|
assert_equal('example.txt', file)
assert_equal("1\n2\n3\n", File.read(your))
assert_equal("1\n4\n3\n", File.read(their))
end
end
end
end
end
Version data entries
26 entries across 26 versions & 4 rubygems