← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_version_info.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/test_version_info.py
139
139
        wt.rename_one('b', 'd')
140
140
        stanza = regen(check_for_clean=True, include_file_revisions=True)
141
141
        file_rev_stanza = get_one_stanza(stanza, 'file-revisions')
142
 
        self.assertEqual(['', 'a', 'b', 'c', 'd'], 
 
142
        self.assertEqual(['', 'a', 'b', 'c', 'd'],
143
143
                          file_rev_stanza.get_all('path'))
144
 
        self.assertEqual(['r3', 'modified', 'renamed to d', 'new', 
 
144
        self.assertEqual(['r3', 'modified', 'renamed to d', 'new',
145
145
                          'renamed from b'],
146
146
                         file_rev_stanza.get_all('revision'))
147
147
 
194
194
        self.build_tree(['branch/c'])
195
195
        tvi = regen(check_for_clean=True, include_file_revisions=True)
196
196
        self.assertEqual(False, tvi.version_info['clean'])
197
 
        self.assertEqual(['', 'a', 'b', 'c'], 
 
197
        self.assertEqual(['', 'a', 'b', 'c'],
198
198
                         sorted(tvi.file_revisions.keys()))
199
199
        self.assertEqual('r3', tvi.file_revisions['a'])
200
200
        self.assertEqual('r2', tvi.file_revisions['b'])
212
212
        wt.add('c')
213
213
        wt.rename_one('b', 'd')
214
214
        tvi = regen(check_for_clean=True, include_file_revisions=True)
215
 
        self.assertEqual(['', 'a', 'b', 'c', 'd'], 
 
215
        self.assertEqual(['', 'a', 'b', 'c', 'd'],
216
216
                          sorted(tvi.file_revisions.keys()))
217
217
        self.assertEqual('modified', tvi.file_revisions['a'])
218
218
        self.assertEqual('renamed to d', tvi.file_revisions['b'])
223
223
        wt.remove(['c', 'd'])
224
224
        os.remove('branch/d')
225
225
        tvi = regen(check_for_clean=True, include_file_revisions=True)
226
 
        self.assertEqual(['', 'a', 'c', 'd'], 
 
226
        self.assertEqual(['', 'a', 'c', 'd'],
227
227
                          sorted(tvi.file_revisions.keys()))
228
228
        self.assertEqual('r4', tvi.file_revisions['a'])
229
229
        self.assertEqual('unversioned', tvi.file_revisions['c'])