← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Erik Bagfors
  • Date: 2007-04-11 01:18:00 UTC
  • mto: This revision was merged to the branch mainline in revision 2439.
  • Revision ID: erik@bagfors.nu-20070411011800-7gxbox8gbqrdp40i
test for merges with tags in log

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_log.py
133
133
        # since dicts are unordered, need to check both possibilities
134
134
        self.assertTrue(('tags: tag1, tag1.1' in log) or 
135
135
                        ('tags: tag1.1, tag1' in log))
 
136
                        
 
137
    def test_merged_log_with_tags(self):
 
138
        os.mkdir('branch1')
 
139
        os.chdir('branch1')
 
140
        self._prepare(format='dirstate-tags')
 
141
        os.chdir('..')
 
142
        self.run_bzr('branch', 'branch1', 'branch2')
 
143
        os.chdir('branch1')
 
144
        self.run_bzr('commit', '-m', 'foobar', '--unchanged')
 
145
        self.runbzr('tag tag1')
 
146
        os.chdir('../branch2')
 
147
        self.run_bzr('merge', '../branch1')
 
148
        self.run_bzr('commit', '-m', 'merge branch 1')
 
149
        log = self.runbzr("log -r-1")[0]
 
150
        self.assertTrue('    tags: tag1' in log)
136
151
 
137
152
 
138
153
class TestLogMerges(ExternalBase):