/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/merge3.py

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

• reverse the comparison (6670.4.8 to 5200.3.2)
• stop comparing with revision 5200.3.2

Show diffs side-by-side

added

removed

breezy/merge3.py

14

14

# along with this program; if not, write to the Free Software

15

15

# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

16

16

 

 

17

from __future__ import absolute_import

17

18

 

18

19

# mbp: "you know that thing where cvs gives you conflict markers?"

19

20

# s: "i hate that."

20

21

 

21

 

from bzrlib import (

 

22

from . import (

22

23

    errors,

23

24

    patiencediff,

24

25

    textfile,

52

53

    """

53

54

    if (aend-astart) != (bend-bstart):

54

55

        return False

55

 

    for ia, ib in zip(xrange(astart, aend), xrange(bstart, bend)):

 

56

    for ia, ib in zip(range(astart, aend), range(bstart, bend)):

56

57

        if a[ia] != b[ib]:

57

58

            return False

58

59

    else:

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0