← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/blackbox.py

  • Committer: Aaron Bentley
  • Date: 2005-10-06 03:57:20 UTC
  • mto: (1185.12.13)
  • mto: This revision was merged to the branch mainline in revision 1419.
  • Revision ID: aaron.bentley@utoronto.ca-20051006035720-2e50eaeca13837bc
Commit aborts with conflicts in the tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/blackbox.py
465
465
        self.runbzr('merge ../other')
466
466
        result = self.runbzr('conflicts', backtick=1)
467
467
        self.assertEquals(result, "hello\nquestion\n")
468
 
        result = self.runbzr('resolve hello')
 
468
        self.runbzr('resolve hello')
469
469
        result = self.runbzr('conflicts', backtick=1)
470
470
        self.assertEquals(result, "question\n")
471
 
        result = self.runbzr('resolve --all')
 
471
        self.runbzr('commit -m conflicts', retcode=1)
 
472
        self.runbzr('resolve --all')
472
473
        result = self.runbzr('conflicts', backtick=1)
 
474
        self.runbzr('commit -m conflicts')
473
475
        self.assertEquals(result, "")
474
476
        
475
477