def merge_test(fileName1, fileName2):
merger = Merger()
file1 = open(fileName1, "r")
file2 = open(fileName2, "r")
merger.parseFirst(file1.read())
merger.parserSecond(file2.read())
file1.close()
file2.close()
conflictCounter = 0
while merger.hasBothNextBlock():
if merger.isBlockConflict():
print(r'Conflict=#%s#%s#' % (merger.getBlockOfFirst(), merger.getBlockOfSecond()))
conflictCounter += 1
else:
print('Merged =#%s#' % merger.getBlockOfThird())
print('First rest=' + merger.getRestOfFirstBlock())
print('Second rest=' + merger.getRestOfSecondBlock())
print('Num of conflicts:' + str(conflictCounter))
def merge_test(fileName1, fileName2):
merger = Merger()
file1 = open(fileName1, "r")
file2 = open(fileName2, "r")
merger.parseFirst(file1.read())
merger.parserSecond(file2.read())
file1.close()
file2.close()
conflictCounter = 0
while merger.hasBothNextBlock():
if merger.isBlockConflict():
print(r'Conflict=#%s#%s#' %
(merger.getBlockOfFirst(), merger.getBlockOfSecond()))
conflictCounter += 1
else:
print('Merged =#%s#' % merger.getBlockOfThird())
print('First rest=' + merger.getRestOfFirstBlock())
print('Second rest=' + merger.getRestOfSecondBlock())
print('Num of conflicts:' + str(conflictCounter))
