/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_uncommit.py
25
25
 
26
26
 
27
27
class TestUncommit(TestCaseWithTransport):
 
28
 
28
29
    def create_simple_tree(self):
29
30
        wt = self.make_branch_and_tree('tree')
30
31
        self.build_tree(['tree/a', 'tree/b', 'tree/c'])
141
142
 
142
143
        self.assertEqual(['a2', 'b4'], wt.get_parent_ids())
143
144
 
 
145
    def test_uncommit_pending_merge(self):
 
146
        wt = self.create_simple_tree()
 
147
        tree2 = wt.bzrdir.sprout('tree2').open_workingtree()
 
148
        tree2.commit('unchanged', rev_id='b3')
 
149
 
 
150
        wt.branch.fetch(tree2.branch)
 
151
        wt.set_pending_merges(['b3'])
 
152
 
 
153
        os.chdir('tree')
 
154
        out, err = self.run_bzr('uncommit', '--force')
 
155
        self.assertEqual('a1', wt.last_revision())
 
156
        self.assertEqual(['b3'], wt.pending_merges())
 
157
 
144
158
    def test_uncommit_multiple_merge(self):
145
159
        wt = self.create_simple_tree()
146
160
 
163
177
 
164
178
        self.assertEqual(['a2', 'b3', 'b4'], wt.get_parent_ids())
165
179
 
 
180
    def test_uncommit_merge_plus_pending(self):
 
181
        wt = self.create_simple_tree()
 
182
 
 
183
        tree2 = wt.bzrdir.sprout('tree2').open_workingtree()
 
184
 
 
185
        tree2.commit('unchanged', rev_id='b3')
 
186
        wt.branch.fetch(tree2.branch)
 
187
        wt.set_pending_merges(['b3'])
 
188
        wt.commit('merge b3', rev_id='a3')
 
189
 
 
190
        tree2.commit('unchanged', rev_id='b4')
 
191
        wt.branch.fetch(tree2.branch)
 
192
        wt.set_pending_merges(['b4'])
 
193
 
 
194
        self.assertEqual('a3', wt.last_revision())
 
195
        self.assertEqual(['b4'], wt.pending_merges())
 
196
 
 
197
        os.chdir('tree')
 
198
        out, err = self.run_bzr('uncommit', '--force', '-r', '2')
 
199
 
 
200
        self.assertEqual('a2', wt.last_revision())
 
201
        self.assertEqual(['b3', 'b4'], wt.pending_merges())
 
202
 
166
203
    def test_uncommit_octopus_merge(self):
167
204
        # Check that uncommit keeps the pending merges in the same order
168
205
        wt = self.create_simple_tree()