~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/uncommit.py

  • Committer: John Arbash Meinel
  • Date: 2006-06-18 02:21:57 UTC
  • mfrom: (1787 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1794.
  • Revision ID: john@arbash-meinel.com-20060618022157-6e33aa9b67c25e4f
[merge] bzr.dev 1787

Show diffs side-by-side

added added

removed removed

Lines of Context:
18
18
"""
19
19
 
20
20
import os
 
21
import bzrlib
21
22
from bzrlib.errors import BoundBranchOutOfDate
22
23
 
23
24
def test_remove(filename):
34
35
    :param verbose: Print each step as you do it
35
36
    :param revno: Remove back to this revision
36
37
    """
 
38
    from bzrlib.atomicfile import AtomicFile
37
39
    unlockable = []
38
40
    try:
39
41
        if tree is not None: