/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to tests/test_diff.py

  • Committer: Aaron Bentley
  • Date: 2008-05-09 03:41:19 UTC
  • mto: This revision was merged to the branch mainline in revision 492.
  • Revision ID: aaron@aaronbentley.com-20080509034119-xpbjbxpld6tp3szz
Ensure MergeController sets pending merges and updates files

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_diff.py
109
109
        return 'save-path'
110
110
 
111
111
    def _get_merge_target(self):
112
 
        return 'other'
 
112
        return 'this'
113
113
 
114
114
    def destroy(self):
115
115
        pass
157
157
        this = self.make_branch_and_tree('this')
158
158
        this.commit('first commit')
159
159
        other = this.bzrdir.sprout('other').open_workingtree()
 
160
        self.build_tree_contents([('foo', 'bar')])
160
161
        other.commit('second commit')
161
162
        other.lock_write()
162
163
        try:
169
170
        controller = MergeDirectiveController('directive', directive, window)
170
171
        controller.perform_merge(window)
171
172
        self.assertTrue(window.merge_successful)
 
173
        self.assertEqual(other.last_revision(), this.get_parent_ids()[1])
 
174
        self.assertFileEqual('bar', 'foo')
172
175
 
173
176
 
174
177
class Test_IterChangesToStatus(tests.TestCaseWithTransport):