~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/textmerge.py

• browse files at revision 5110
• compare with another revision
• download diff
• download tarball
• view history from revision 5110

• reverse the comparison (5110 to 6621)
• stop comparing with revision 6621

Show diffs side-by-side

added

removed

bzrlib/textmerge.py

1

 

# Copyright (C) 2006, 2009, 2010 Canonical Ltd

 

1

# Copyright (C) 2005, 2006 Canonical Ltd

2

2

#

3

3

# This program is free software; you can redistribute it and/or modify

4

4

# it under the terms of the GNU General Public License as published by

17

17

# Author: Martin Pool <mbp@canonical.com>

18

18

#         Aaron Bentley <aaron.bentley@utoronto.ca>

19

19

 

20

 

from __future__ import absolute_import

21

20

 

22

 

from bzrlib.lazy_import import lazy_import

23

 

lazy_import(globals(), """

24

 

from bzrlib import patiencediff

25

 

""")

 

21

import bzrlib.patiencediff

26

22

 

27

23

 

28

24

class TextMerge(object):

135

131

        """Return structured merge info.

136

132

        See TextMerge docstring.

137

133

        """

138

 

        sm = patiencediff.PatienceSequenceMatcher(

139

 

            None, self.lines_a, self.lines_b)

 

134

        sm = bzrlib.patiencediff.PatienceSequenceMatcher(None, self.lines_a, self.lines_b)

140

135

        pos_a = 0

141

136

        pos_b = 0

142

137

        for ai, bi, l in sm.get_matching_blocks():

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.1