← 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-19 02:40:58 UTC
  • mto: (1185.19.1)
  • mto: This revision was merged to the branch mainline in revision 1474.
  • Revision ID: aaron.bentley@utoronto.ca-20051019024058-4562b385778ee490
Added --show-base to merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/blackbox.py
497
497
        file('question', 'wb').write("What do you get when you multiply six"
498
498
                                   "times nine?")
499
499
        self.runbzr('commit -m this')
 
500
        self.runbzr('merge ../other --show-base')
 
501
        conflict_text = file('hello').read()
 
502
        assert '<<<<<<<' in conflict_text
 
503
        assert '>>>>>>>' in conflict_text
 
504
        assert '=======' in conflict_text
 
505
        assert '|||||||' in conflict_text
 
506
        assert 'hi world' in conflict_text
 
507
        self.runbzr('revert')
 
508
        self.runbzr('resolve --all')
500
509
        self.runbzr('merge ../other')
 
510
        conflict_text = file('hello').read()
 
511
        assert '|||||||' not in conflict_text
 
512
        assert 'hi world' not in conflict_text
501
513
        result = self.runbzr('conflicts', backtick=1)
502
514
        self.assertEquals(result, "hello\nquestion\n")
503
515
        result = self.runbzr('status', backtick=1)