~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/weave.py

Committer: Martin Pool
Date: 2005-11-29 10:04:14 UTC
mto: (1185.74.1 bzr.dev (Main development branch)) (1526.1.3 run_tests_twice_for_i18n) (1540.1.3 bzr.dev (Main development branch)) (1505.1.20 bzr-bound-branch) (1685.1.1 bzr-encoding) (1534.1.1 integration) (1553.5.1 bzr.dev (Main development branch)) (1608.2.1 bzr.mbp.escape-stores)
mto: This revision was merged to the branch mainline in revision 1518.
Revision ID: mbp@sourcefrog.net-20051129100414-54250ca617c5252c

Remove dead Weave.merge() method (use weave_merge instead)

files modified:
bzrlib/weave.py

Show diffs side-by-side

added added

removed removed

bzrlib/weave.py

621

# properly paired, etc.

622

623

624

625

def merge(self, merge_versions):

626

"""Automerge and mark conflicts between versions.

627

628

This returns a sequence, each entry describing alternatives

629

for a chunk of the file. Each of the alternatives is given as

630

a list of lines.

631

632

If there is a chunk of the file where there's no diagreement,

633

only one alternative is given.

634

"""

635

# approach: find the included versions common to all the

636

# merged versions

637

raise NotImplementedError()

638

639

640

641

624

def _delta(self, included, lines):

642

625

"""Return changes from basis to new revision.

643

626

Older »