← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to shelf.py

  • Committer: Aaron Bentley
  • Date: 2008-11-05 14:02:52 UTC
  • mfrom: (676.1.3 bzrtools-1.9)
  • Revision ID: aaron@aaronbentley.com-20081105140252-aem9ee88p7m33ceg
Merge with bzrtools-1.9

Show diffs side-by-side

added added

removed removed

Lines of Context:
shelf.py
1
1
import os
2
2
import sys
 
3
import subprocess
3
4
from datetime import datetime
4
 
from errors import CommandError, PatchFailed
 
5
from errors import CommandError, PatchFailed, PatchInvokeError
5
6
from hunk_selector import ShelveHunkSelector, UnshelveHunkSelector
6
7
from patch import run_patch
7
 
from patchsource import FilePatchSource
 
8
from patchsource import PatchSource, FilePatchSource
8
9
from bzrlib.osutils import rename
9
10
 
10
11
class Shelf(object):