← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to patch.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:
patch.py
17
17
import sys
18
18
import subprocess
19
19
 
20
 
from bzrlib.workingtree import WorkingTree
21
20
import bzrlib.add
22
21
 
23
22
from bzrlib.plugins.bzrtools.bzrtools import open_from_url
24
 
from errors import CommandError, PatchFailed, PatchInvokeError
 
23
from errors import PatchFailed, PatchInvokeError
25
24
 
26
25
def patch(tree, location, strip, quiet=False):
27
26
    """Apply a patch to a branch, using patch(1).  URLs may be used."""