← 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-27 23:41:45 UTC
  • mto: (1185.25.1)
  • mto: This revision was merged to the branch mainline in revision 1491.
  • Revision ID: abentley@panoramicfeedback.com-20051027234145-cc851c8f0f63eaba
Integrated reprocessing into the rest of the merge stuff

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/blackbox.py
354
354
        self.runbzr('revert --no-backup')
355
355
        self.runbzr('merge ../b -r last:1..last:1 --merge-type weave')
356
356
        self.runbzr('revert --no-backup')
 
357
        self.runbzr('merge ../b -r last:1..last:1 --reprocess')
 
358
        self.runbzr('revert --no-backup')
357
359
        self.runbzr('merge ../b -r last:1')
358
360
        self.check_file_contents('goodbye', 'quux')
359
361
        # Merging a branch pulls its revision into the tree