24
26
open('a', 'ab').write('more\n')
25
27
self.capture('commit -m more')
29
# run missing in a against b
29
lines = self.capture('missing ../b', retcode=1).splitlines()
31
# this should not require missing to take out a write lock on a
32
# or b. So we take a write lock on both to test that at the same
33
# time. This may let the test pass while the default branch is an
34
# os-locking branch, but it will trigger failures with lockdir based
36
branch_a = Branch.open('.')
38
branch_b = Branch.open('../b')
40
out,err = self.run_bzr('missing', '../b', retcode=1)
41
lines = out.splitlines()
30
42
# we're missing the extra revision here
31
43
self.assertEqual(missing, lines[0])
44
# and we expect 8 lines of output which we trust at the moment to be
32
46
self.assertEqual(8, len(lines))
47
# we do not expect any error output.
48
self.assertEqual('', err)
49
# unlock the branches for the rest of the test
34
53
# get extra revision from b
35
54
self.capture('merge ../b')