~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to shelf.py

  • Committer: Christophe Troestler
  • Date: 2008-07-05 11:09:20 UTC
  • mto: This revision was merged to the branch mainline in revision 657.
  • Revision ID: christophe.troestler@umh.ac.be-20080705110920-81ee7liqh9nm5y9e
[Bug #220545] Read '/etc/colordiffrc' before '~/.colordiffrc'.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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):