← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2009-02-23 15:29:35 UTC
  • mfrom: (3943.7.7 bzr.code_style_cleanup)
  • mto: This revision was merged to the branch mainline in revision 4033.
  • Revision ID: john@arbash-meinel.com-20090223152935-oel9m92mwcc6nb4h
Merge the removal of all trailing whitespace, and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
108
108
        self.assertTrue("Not a branch" in err)
109
109
        self.run_bzr('merge -r revno:%d:./..revno:%d:../b'
110
110
                    %(ancestor,b.revno()))
111
 
        self.assertEquals(a.get_parent_ids(), 
 
111
        self.assertEquals(a.get_parent_ids(),
112
112
                          [a.branch.last_revision(), b.last_revision()])
113
113
        self.check_file_contents('goodbye', 'quux')
114
114
        a_tree.revert(backups=False)
246
246
        # test implicit --remember after resolving conflict
247
247
        tree_b.commit('commit d')
248
248
        out, err = self.run_bzr('merge')
249
 
        
 
249
 
250
250
        base = urlutils.local_path_from_url(branch_a.base)
251
251
        self.assertStartsWith(err,
252
252
                          'Merging from remembered submit location %s\n' % (base,))
438
438
 
439
439
    def assertDirectoryContent(self, directory, entries, message=''):
440
440
        """Assert whether entries (file or directories) exist in a directory.
441
 
        
 
441
 
442
442
        It also checks that there are no extra entries.
443
443
        """
444
444
        ondisk = os.listdir(directory)