← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-03-02 08:49:07 UTC
  • mfrom: (5067.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100302084907-z4r0yoa4ldspjz82
(vila) Resolve --take-this or --take-other correctly rename kept file

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_checkout.py
1
 
# Copyright (C) 2005, 2006, 2009 Canonical Ltd
 
1
# Copyright (C) 2006, 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
160
160
            '--hardlink'])
161
161
        source_stat = os.stat('source/file1')
162
162
        target_stat = os.stat('target/file1')
163
 
        same_file = (source_stat == target_stat)
164
 
        if same_file:
165
 
            pass
166
 
        else:
167
 
            # https://bugs.edge.launchpad.net/bzr/+bug/408193
168
 
            self.assertContainsRe(err, "hardlinking working copy files is "
169
 
                "not currently supported")
170
 
            raise KnownFailure("--hardlink doesn't work in formats "
171
 
                "that support content filtering (#408193)")
 
163
        self.assertEqual(source_stat, target_stat)