← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Vincent Ladeuil
  • Date: 2010-06-17 09:23:19 UTC
  • mfrom: (5301 +trunk)
  • mto: (5247.1.8 first-try)
  • mto: This revision was merged to the branch mainline in revision 5326.
  • Revision ID: v.ladeuil+lp@free.fr-20100617092319-da2bzdtf3j0voynf
Merge bzr.dev into cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge_directive.py
1
 
# Copyright (C) 2007 Canonical Ltd
 
1
# Copyright (C) 2007, 2009, 2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
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)