← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transform.py

  • Committer: Aaron Bentley
  • Date: 2006-04-05 20:37:37 UTC
  • mto: (2027.1.2 revert-subpath-56549)
  • mto: This revision was merged to the branch mainline in revision 1647.
  • Revision ID: abentley@panoramicfeedback.com-20060405203737-d50848ef2df7344a
Eliminated conflicts_to_strings, made remove_files a ConflictList member

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transform.py
17
17
import os
18
18
 
19
19
from bzrlib.bzrdir import BzrDir
20
 
from bzrlib.conflicts import (conflicts_to_strings, DuplicateEntry,
21
 
                              DuplicateID, MissingParent, UnversionedParent,
22
 
                              ParentLoop)
 
20
from bzrlib.conflicts import (DuplicateEntry, DuplicateID, MissingParent,
 
21
                              UnversionedParent, ParentLoop)
23
22
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
24
23
                           ReusingTransform, CantMoveRoot, NotVersionedError,
25
24
                           ExistingLimbo, ImmortalLimbo, LockError)
418
417
        raw_conflicts = resolve_conflicts(tt)
419
418
        cooked_conflicts = cook_conflicts(raw_conflicts, tt)
420
419
        tt.finalize()
421
 
        conflicts_s = list(conflicts_to_strings(cooked_conflicts))
 
420
        conflicts_s = [str(c) for c in cooked_conflicts]
422
421
        self.assertEqual(len(cooked_conflicts), len(conflicts_s))
423
422
        self.assertEqual(conflicts_s[0], 'Conflict adding file dorothy.  '
424
423
                                         'Moved existing file to '