← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_missing.py

  • Committer: John Arbash Meinel
  • Date: 2009-02-23 15:29:35 UTC
  • mfrom: (3943.7.7 bzr.code_style_cleanup)
  • mto: This revision was merged to the branch mainline in revision 4033.
  • Revision ID: john@arbash-meinel.com-20090223152935-oel9m92mwcc6nb4h
Merge the removal of all trailing whitespace, and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_missing.py
63
63
        b_tree.commit(message='more')
64
64
 
65
65
        # run missing in a against b
66
 
        # this should not require missing to take out a write lock on a 
 
66
        # this should not require missing to take out a write lock on a
67
67
        # or b. So we take a write lock on both to test that at the same
68
68
        # time. This may let the test pass while the default branch is an
69
69
        # os-locking branch, but it will trigger failures with lockdir based
100
100
        lines3 = self.run_bzr('missing ../b --theirs-only', retcode=0)[0]
101
101
        self.assertEqualDiff('Other branch is up to date.\n', lines3)
102
102
 
103
 
        # relative to a, missing the 'merge' commit 
 
103
        # relative to a, missing the 'merge' commit
104
104
        os.chdir('../b')
105
105
        lines = self.run_bzr('missing ../a', retcode=1)[0].splitlines()
106
106
        self.assertEqual(missing, lines[0])