← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to shelf.py

  • Committer: Aaron Bentley
  • Date: 2011-09-25 01:23:51 UTC
  • mfrom: (778 bzrtools.dev)
  • mto: This revision was merged to the branch mainline in revision 779.
  • Revision ID: aaron@aaronbentley.com-20110925012351-s3q6441rx3tqyw2n
Merged bzrtools.dev into fix-nick-reference.

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
4
3
from datetime import datetime
5
 
from errors import CommandError, PatchFailed, PatchInvokeError
 
4
from errors import CommandError, PatchFailed
6
5
from hunk_selector import ShelveHunkSelector, UnshelveHunkSelector
7
6
from patch import run_patch
8
 
from patchsource import PatchSource, FilePatchSource
 
7
from patchsource import FilePatchSource
9
8
from bzrlib.osutils import rename
10
9
 
11
10
class Shelf(object):