← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_annotate.py

Updates from review comments

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_annotate.py
16
16
 
17
17
from bzrlib import annotate, tests
18
18
 
 
19
 
19
20
def annotation(text):
20
21
    return [tuple(l.split(' ', 1)) for l in text.splitlines(True)]
21
22
 
 
23
 
22
24
parent_1 = annotation("""\
23
25
rev1 a
24
26
rev2 b
27
29
rev5 e
28
30
""")
29
31
 
 
32
 
30
33
parent_2 = annotation("""\
31
34
rev1 a
32
35
rev3 c
36
39
rev8 h
37
40
""")
38
41
 
 
42
 
39
43
expected_2_1 = annotation("""\
40
44
rev1 a
41
45
blahblah b
44
48
rev7 e
45
49
""")
46
50
 
 
51
 
47
52
# a: in both, same value, kept
48
53
# b: in 1, kept
49
54
# c: in both, same value, kept
62
67
rev8 h
63
68
""")
64
69
 
 
70
 
65
71
new_1 = """\
66
72
a
67
73
b
70
76
e
71
77
""".splitlines(True)
72
78
 
 
79
 
73
80
new_2 = """\
74
81
a
75
82
b