/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/uncommit.py

  • Committer: Martin
  • Date: 2010-05-03 20:55:05 UTC
  • mto: This revision was merged to the branch mainline in revision 5204.
  • Revision ID: gzlist@googlemail.com-20100503205505-okdad5rbf12osway
Include OverflowError in error types bencode translates, as Python 2.4 raises that rather than IndexError in some situations

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/uncommit.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
"""Remove the last revision from the history of the current branch."""
18
18
 
19
19
# TODO: make the guts of this methods on tree, branch.
20
20
 
21
 
import os
22
 
 
23
21
from bzrlib import (
24
22
    errors,
25
23
    revision as _mod_revision,
44
42
        if tree is not None:
45
43
            tree.lock_write()
46
44
            unlockable.append(tree)
47
 
        
 
45
 
48
46
        branch.lock_write()
49
47
        unlockable.append(branch)
50
48