← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_workingtree/test_executable.py

  • Committer: Andrew Bennetts
  • Date: 2010-01-12 03:53:21 UTC
  • mfrom: (4948 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4964.
  • Revision ID: andrew.bennetts@canonical.com-20100112035321-hofpz5p10224ryj3
Merge lp:bzr, resolving conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_workingtree/test_executable.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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""Test the executable bit under various working tree formats."""
18
18
 
23
23
    )
24
24
from bzrlib.inventory import InventoryFile
25
25
from bzrlib.transform import TreeTransform
26
 
from bzrlib.tests.workingtree_implementations import TestCaseWithWorkingTree
 
26
from bzrlib.tests.per_workingtree import TestCaseWithWorkingTree
27
27
 
28
28
 
29
29
class TestExecutable(TestCaseWithWorkingTree):
30
30
 
31
31
    def setUp(self):
32
32
        super(TestExecutable, self).setUp()
33
 
 
34
33
        self.a_id = "a-20051208024829-849e76f7968d7a86"
35
34
        self.b_id = "b-20051208024829-849e76f7968d7a86"
36
35
        wt = self.make_branch_and_tree('b1')
170
169
 
171
170
    def test_08_no_op_revert(self):
172
171
        """Just do a simple revert without anything changed
173
 
        
 
172
 
174
173
        The bits shouldn't swap.
175
174
        """
176
175
        self.wt.commit('adding a,b', rev_id='r1')