/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_merge_directive.py

  • Committer: Martin von Gagern
  • Date: 2010-05-28 14:15:28 UTC
  • mto: This revision was merged to the branch mainline in revision 5284.
  • Revision ID: martin.vgagern@gmx.net-20100528141528-px8k6i9pqdyob91l
Add --directory option to 7 more commands.

This batch adds a --directory option to the following commands:
conflicts, merge-directive, missing, resolve, shelve, switch, unshelve

Blackbox tests for all of these are included.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge_directive.py
248
248
        tree1, tree2 = self.prepare_merge_directive()
249
249
        tree1.commit(u'messag\xe9')
250
250
        self.run_bzr('merge-directive ../tree2') # no exception raised
 
251
 
 
252
    def test_merge_directive_directory(self):
 
253
        """Test --directory option"""
 
254
        import re
 
255
        re_timestamp = re.compile(r'^# timestamp: .*', re.M)
 
256
        self.prepare_merge_directive()
 
257
        md1 = self.run_bzr('merge-directive ../tree2')[0]
 
258
        md1 = re_timestamp.sub('# timestamp: XXX', md1)
 
259
        os.chdir('..')
 
260
        md2 = self.run_bzr('merge-directive --directory tree1 tree2')[0]
 
261
        md2 = re_timestamp.sub('# timestamp: XXX', md2)
 
262
        self.assertEqualDiff(md1.replace('../tree2', 'tree2'), md2)