← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/blackbox.py

  • Committer: abentley
  • Date: 2005-10-16 23:47:26 UTC
  • mto: (1185.25.1)
  • mto: This revision was merged to the branch mainline in revision 1460.
  • Revision ID: abentley@lappy-20051016234726-c7699fd0b77457d2
Restored branch convergence to bzr pull

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/blackbox.py
401
401
        os.chdir('../b')
402
402
        self.runbzr('commit -m blah3 --unchanged')
403
403
        self.runbzr('pull ../a', retcode=1)
404
 
        print "DECIDE IF PULL CAN CONVERGE, blackbox.py"
405
 
        return
406
404
        os.chdir('../a')
407
405
        self.runbzr('merge ../b')
408
406
        self.runbzr('commit -m blah4 --unchanged')