← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/mdiff.py

  • Committer: Martin Pool
  • Date: 2005-08-25 05:58:05 UTC
  • mfrom: (974.1.36)
  • Revision ID: mbp@sourcefrog.net-20050825055805-8c892bc3c2d75131
- merge aaron's merge improvements:

  * When merging, pull in all missing revisions from the source
    branch. 

  * Detect common ancestors by looking at the whole ancestry graph, 
    rather than just mainline history.

  Some changes to reconcile this with parallel updates to the test and
  trace code.

aaron.bentley@utoronto.ca-20050823052551-f3401a8b57d9126f

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/mdiff.py
27
27
 
28
28
# FIXME: doesn't work properly on files without trailing newlines
29
29
 
30
 
import difflib
31
 
import struct
32
 
import sys
33
30
import unittest
 
31
import difflib, sys, struct
34
32
from cStringIO import StringIO
35
33
 
36
 
 
37
34
def linesplit(a):
38
35
    """Split into two lists: content and line positions.
39
36