← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Richard Wilbur
  • Date: 2016-02-04 19:07:28 UTC
  • mto: This revision was merged to the branch mainline in revision 6618.
  • Revision ID: richard.wilbur@gmail.com-20160204190728-p0zvfii6zase0fw7
Update COPYING.txt from the original http://www.gnu.org/licenses/gpl-2.0.txt  (Only differences were in whitespace.)  Thanks to Petr Stodulka for pointing out the discrepancy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_resolve.py
36
36
Path conflict: mydir3 / mydir2
37
37
Text conflict in myfile
38
38
$ bzr resolve myfile
39
 
2>1 conflict(s) resolved, 2 remaining
 
39
2>1 conflict resolved, 2 remaining
40
40
$ bzr resolve my_other_file
41
 
2>1 conflict(s) resolved, 1 remaining
 
41
2>1 conflict resolved, 1 remaining
42
42
$ bzr resolve mydir2
43
 
2>1 conflict(s) resolved, 0 remaining
 
43
2>1 conflict resolved, 0 remaining
44
44
""")
45
45
 
46
46
    def test_resolve_all(self):
47
47
        self.run_script("""\
48
48
$ cd branch
49
49
$ bzr resolve --all
50
 
2>3 conflict(s) resolved, 0 remaining
 
50
2>3 conflicts resolved, 0 remaining
51
51
$ bzr conflicts
52
52
""")
53
53
 
56
56
$ mkdir branch/subdir
57
57
$ cd branch/subdir
58
58
$ bzr resolve ../myfile
59
 
2>1 conflict(s) resolved, 2 remaining
 
59
2>1 conflict resolved, 2 remaining
60
60
""")
61
61
 
62
62
    def test_resolve_via_directory_option(self):
63
63
        self.run_script("""\
64
64
$ bzr resolve -d branch myfile
65
 
2>1 conflict(s) resolved, 2 remaining
 
65
2>1 conflict resolved, 2 remaining
66
66
""")
67
67
 
68
68
    def test_resolve_all_via_directory_option(self):
69
69
        self.run_script("""\
70
70
$ bzr resolve -d branch --all
71
 
2>3 conflict(s) resolved, 0 remaining
 
71
2>3 conflicts resolved, 0 remaining
72
72
$ bzr conflicts -d branch
73
73
""")
74
74
 
75
75
 
 
76
class TestBug788000(script.TestCaseWithTransportAndScript):
 
77
 
 
78
    def test_bug_788000(self):
 
79
        self.run_script('''\
 
80
$ bzr init a
 
81
$ mkdir a/dir
 
82
$ echo foo > a/dir/file
 
83
$ bzr add a/dir
 
84
$ cd a
 
85
$ bzr commit -m one
 
86
$ cd ..
 
87
$ bzr clone a b
 
88
$ echo bar > b/dir/file
 
89
$ cd a
 
90
$ rm -r dir
 
91
$ bzr commit -m two
 
92
$ cd ../b
 
93
''',
 
94
                        null_output_matches_anything=True)
 
95
 
 
96
        self.run_script('''\
 
97
$ bzr pull
 
98
Using saved parent location:...
 
99
Now on revision 2.
 
100
2>RM  dir/file => dir/file.THIS
 
101
2>Conflict: can't delete dir because it is not empty.  Not deleting.
 
102
2>Conflict because dir is not versioned, but has versioned children...
 
103
2>Contents conflict in dir/file
 
104
2>3 conflicts encountered.
 
105
''')
 
106
        self.run_script('''\
 
107
$ bzr resolve --take-other
 
108
2>deleted dir/file.THIS
 
109
2>deleted dir
 
110
2>3 conflicts resolved, 0 remaining
 
111
''')
 
112
 
 
113
 
76
114
class TestResolveAuto(tests.TestCaseWithTransport):
77
115
 
78
116
    def test_auto_resolve(self):
85
123
        file_conflict = conflicts.TextConflict('file', file_id='file_id')
86
124
        tree.set_conflicts(conflicts.ConflictList([file_conflict]))
87
125
        note = self.run_bzr('resolve', retcode=1, working_dir='tree')[1]
88
 
        self.assertContainsRe(note, '0 conflict\\(s\\) auto-resolved.')
 
126
        self.assertContainsRe(note, '0 conflicts auto-resolved.')
89
127
        self.assertContainsRe(note,
90
128
            'Remaining conflicts:\nText conflict in file')
91
129
        self.build_tree_contents([('tree/file', 'a\n')])