/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_textmerge.py

  • Committer: Richard Wilbur
  • Date: 2016-02-04 19:07:28 UTC
  • mto: This revision was merged to the branch mainline in revision 6618.
  • Revision ID: richard.wilbur@gmail.com-20160204190728-p0zvfii6zase0fw7
Update COPYING.txt from the original http://www.gnu.org/licenses/gpl-2.0.txt  (Only differences were in whitespace.)  Thanks to Petr Stodulka for pointing out the discrepancy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_textmerge.py
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
#
17
17
# Author: Aaron Bentley <aaron.bentley@utoronto.ca>
18
 
from breezy.textmerge import Merge2
19
 
from breezy.tests import TestCase
 
18
from bzrlib.textmerge import Merge2
 
19
from bzrlib.tests import TestCase
20
20
class TestMerge2(TestCase):
21
21
    def test_agreed(self):
22
22
        lines = "a\nb\nc\nd\ne\nf\n".splitlines(True)
35
35
        self.assertEqualDiff(''.join(mlines), expected)
36
36
 
37
37
    def test_reprocess(self):
38
 
        struct = [('a', 'b'), ('c',), ('def', 'geh'), ('i',)]
 
38
        struct = [('a', 'b'), ('c',), ('def','geh'), ('i',)]
39
39
        expect = [('a', 'b'), ('c',), ('d', 'g'), ('e',), ('f', 'h'), ('i',)]
40
40
        result = Merge2.reprocess_struct(struct)
41
41
        self.assertEqual(list(result), expect)