← 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: Vincent Ladeuil
  • Date: 2011-06-15 11:36:05 UTC
  • mto: This revision was merged to the branch mainline in revision 5975.
  • Revision ID: v.ladeuil+lp@free.fr-20110615113605-p7zyyfry9wy1hquc
https://launchpad.net/bugs/788000
Make ContentConflict resolution more robust

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_missing.py
49
49
        self.assertEqual('', err)
50
50
 
51
51
    def test_missing(self):
52
 
        missing = "You are missing 1 revision:"
 
52
        missing = "You are missing 1 revision(s):"
53
53
 
54
54
        # create a source branch
55
55
        a_tree = self.make_branch_and_tree('a')
92
92
 
93
93
        # compare again, but now we have the 'merge' commit extra
94
94
        lines = self.run_bzr('missing ../b', retcode=1)[0].splitlines()
95
 
        self.assertEqual("You have 1 extra revision:", lines[0])
 
95
        self.assertEqual("You have 1 extra revision(s):", lines[0])
96
96
        self.assertEqual(8, len(lines))
97
97
        lines2 = self.run_bzr('missing ../b --mine-only', retcode=1)[0]
98
98
        lines2 = lines2.splitlines()
99
99
        self.assertEqual(lines, lines2)
100
100
        lines3 = self.run_bzr('missing ../b --theirs-only', retcode=0)[0]
101
 
        self.assertEqualDiff('Other branch has no new revisions.\n', lines3)
 
101
        self.assertEqualDiff('Other branch is up to date.\n', lines3)
102
102
 
103
103
        # relative to a, missing the 'merge' commit
104
104
        os.chdir('../b')
109
109
        lines2 = lines2.splitlines()
110
110
        self.assertEqual(lines, lines2)
111
111
        lines3 = self.run_bzr('missing ../a --mine-only', retcode=0)[0]
112
 
        self.assertEqualDiff('This branch has no new revisions.\n', lines3)
 
112
        self.assertEqualDiff('This branch is up to date.\n', lines3)
113
113
        lines4 = self.run_bzr('missing ../a --short', retcode=1)[0]
114
114
        lines4 = lines4.splitlines()
115
115
        self.assertEqual(4, len(lines4))
131
131
        self.assertEqual("  a", lines8[-1])
132
132
 
133
133
        os.chdir('../a')
134
 
        self.assertEqualDiff('Other branch has no new revisions.\n',
 
134
        self.assertEqualDiff('Other branch is up to date.\n',
135
135
                             self.run_bzr('missing ../b --theirs-only')[0])
136
136
 
137
137
        # after a pull we're back on track
142
142
        self.assertEqualDiff('Branches are up to date.\n',
143
143
                             self.run_bzr('missing ../a')[0])
144
144
        # If you supply mine or theirs you only know one side is up to date
145
 
        self.assertEqualDiff('This branch has no new revisions.\n',
 
145
        self.assertEqualDiff('This branch is up to date.\n',
146
146
                             self.run_bzr('missing ../a --mine-only')[0])
147
 
        self.assertEqualDiff('Other branch has no new revisions.\n',
 
147
        self.assertEqualDiff('Other branch is up to date.\n',
148
148
                             self.run_bzr('missing ../a --theirs-only')[0])
149
149
 
150
150
    def test_missing_filtered(self):
217
217
        b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
218
218
        self.build_tree_contents([('b/a', 'initial\nmore\n')])
219
219
        b_tree.commit(message='more')
220
 
 
 
220
        
221
221
        out2, err2 = self.run_bzr('missing --directory a b', retcode=1)
222
222
        os.chdir('a')
223
223
        out1, err1 = self.run_bzr('missing ../b', retcode=1)