← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/blackbox.py

merge from aaron - fixes bare excepts, adds ancestor namespace

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/blackbox.py
227
227
        os.chdir('a')
228
228
 
229
229
        self.example_branch()
 
230
        self.runbzr('pull', retcode=1)
 
231
        self.runbzr('missing', retcode=1)
 
232
        self.runbzr('missing .')
 
233
        self.runbzr('missing')
 
234
        self.runbzr('pull')
 
235
        self.runbzr('pull /', retcode=1)
 
236
        self.runbzr('pull')
 
237
 
230
238
        os.chdir('..')
231
239
        self.runbzr('branch a b')
232
240
        os.chdir('b')
 
241
        self.runbzr('pull')
233
242
        self.runbzr('commit -m blah --unchanged')
234
243
        os.chdir('../a')
235
244
        a = Branch('.')