~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/blackbox.py

  • Committer: Aaron Bentley
  • Date: 2005-09-12 02:53:07 UTC
  • mto: (1185.3.4)
  • mto: This revision was merged to the branch mainline in revision 1390.
  • Revision ID: aaron.bentley@utoronto.ca-20050912025307-8c21544e8db1cbdb
added all_descendants and node_distances, exception when root doesn't exist

Show diffs side-by-side

added added

removed removed

Lines of Context:
241
241
        os.chdir('../b')
242
242
        self.runbzr('commit -m blah3 --unchanged')
243
243
        self.runbzr('pull ../a', retcode=1)
244
 
        os.chdir('../a')
245
 
        self.runbzr('merge ../b')
246
 
        self.runbzr('commit -m blah4 --unchanged')
247
 
        os.chdir('../b')
248
 
        self.runbzr('pull ../a')
249
 
        assert a.revision_history()[-1] == b.revision_history()[-1]
250
 
        
251
244
 
252
245
    def test_add_reports(self):
253
246
        """add command prints the names of added files."""