← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_conflicts.py

  • Committer: Vincent Ladeuil
  • Date: 2011-08-12 09:49:24 UTC
  • mfrom: (6015.9.10 2.4)
  • mto: This revision was merged to the branch mainline in revision 6066.
  • Revision ID: v.ladeuil+lp@free.fr-20110812094924-knc5s0g7vs31a2f1
Merge 2.4 into trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_conflicts.py
971
971
        if self._other['xfail']:
972
972
            # It's a bit hackish to raise from here relying on being called for
973
973
            # both tests but this avoid overriding test_resolve_taking_other
974
 
            raise tests.KnownFailure(
 
974
            self.knownFailure(
975
975
                "ParentLoop doesn't carry enough info to resolve --take-other")
976
976
    _assert_conflict = assertParentLoop
977
977