~bzr-pqm/bzr/bzr.dev

(jam) Update 'bzr merge --weave' to generate conflicts when one side
modifies and one side deletes a line. (bug #328171)

added added

removed removed

1403

elif state == 'conflicted-b':

1404

ch_b = ch_a = True

1405

lines_b.append(line)

1406

elif state == 'killed-both':

1407

# This counts as a change, even though there is no associated

1408

# line

1409

ch_b = ch_a = True

1406

1410

else:

1407

1411

if state not in ('irrelevant', 'ghost-a', 'ghost-b',

1408

'killed-base', 'killed-both'):

1412

'killed-base'):

1409

1413

raise AssertionError(state)

1410

1414

for struct in outstanding_struct():

1411

1415

yield struct