~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/textmerge.py

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

• reverse the comparison (6510 to 5076.4.6)
• stop comparing with revision 5076.4.6

Show diffs side-by-side

added

removed

bzrlib/textmerge.py

1

 

# Copyright (C) 2005, 2006 Canonical Ltd

 

1

# Copyright (C) 2006, 2009, 2010 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

20

21

 

21

 

import bzrlib.patiencediff

 

22

from bzrlib.lazy_import import lazy_import

 

23

lazy_import(globals(), """

 

24

from bzrlib import patiencediff

 

25

""")

22

26

 

23

27

 

24

28

class TextMerge(object):

131

135

        """Return structured merge info.

132

136

        See TextMerge docstring.

133

137

        """

134

 

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

 

138

        sm = patiencediff.PatienceSequenceMatcher(

 

139

            None, self.lines_a, self.lines_b)

135

140

        pos_a = 0

136

141

        pos_b = 0

137

142

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

• Older »

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