1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
#!/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
|
