← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/versionedfile.py

  • Committer: John Arbash Meinel
  • Date: 2009-04-29 17:02:36 UTC
  • mto: This revision was merged to the branch mainline in revision 4322.
  • Revision ID: john@arbash-meinel.com-20090429170236-v1oe7b235mi73cqs
https://launchpad.net/bugs/328171
Add a per-implementation test that deleting lines conflicts with modifying lines.

At the moment, I don't see a simple way to implement this for LCA merge,
so I'm just marking it as 'expectedFailure'.
However, it works for both Weave merge and for Merge3.
Fixes bug #328171

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/versionedfile.py
1403
1403
            elif state == 'conflicted-b':
1404
1404
                ch_b = ch_a = True
1405
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