← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_too_much.py

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_too_much.py
779
779
        self.assert_('|||||||' not in conflict_text)
780
780
        self.assert_('hi world' not in conflict_text)
781
781
        result = self.runbzr('conflicts', backtick=1)
782
 
        self.assertEquals(result, "hello\nquestion\n")
 
782
        self.assertEquals(result, "Text conflict in hello\nText conflict in"
 
783
                                  " question\n")
783
784
        result = self.runbzr('status', backtick=1)
784
 
        self.assert_("conflicts:\n  hello\n  question\n" in result, result)
 
785
        self.assert_("conflicts:\n  Text conflict in hello\n"
 
786
                     "  Text conflict in question\n" in result, result)
785
787
        self.runbzr('resolve hello')
786
788
        result = self.runbzr('conflicts', backtick=1)
787
 
        self.assertEquals(result, "question\n")
 
789
        self.assertEquals(result, "Text conflict in question\n")
788
790
        self.runbzr('commit -m conflicts', retcode=3)
789
791
        self.runbzr('resolve --all')
790
792
        result = self.runbzr('conflicts', backtick=1)