← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_patch.py

  • Committer: John Arbash Meinel
  • Author(s): Mark Hammond
  • Date: 2008-09-09 17:02:21 UTC
  • mto: This revision was merged to the branch mainline in revision 3697.
  • Revision ID: john@arbash-meinel.com-20080909170221-svim3jw2mrz0amp3
An updated transparent icon for bzr.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_patch.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
from bzrlib.errors import BinaryFile
18
18
from bzrlib.patch import diff3
22
22
class TestPatch(TestCaseInTempDir):
23
23
 
24
24
    def test_diff3_binaries(self):
25
 
        with file('this', 'wb') as f: f.write('a')
26
 
        with file('other', 'wb') as f: f.write('a')
27
 
        with file('base', 'wb') as f: f.write('\x00')
 
25
        file('this', 'wb').write('a')
 
26
        file('other', 'wb').write('a')
 
27
        file('base', 'wb').write('\x00')
28
28
        self.assertRaises(BinaryFile, diff3, 'unused', 'this', 'other', 'base')