~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to __init__.py

  • Committer: Aaron Bentley
  • Date: 2006-03-02 14:41:10 UTC
  • mfrom: (321 bzrtools)
  • mto: (147.4.30 trunk)
  • mto: This revision was merged to the branch mainline in revision 324.
  • Revision ID: abentley@panoramicfeedback.com-20060302144110-ef56e37f5cb21168
Merged -p1 updates.

Show diffs side-by-side

added added

removed removed

Lines of Context:
104
104
    """
105
105
    takes_args = ['filename?']
106
106
    takes_options = ['strip']
107
 
    def run(self, filename=None, strip=0):
 
107
    def run(self, filename=None, strip=1):
108
108
        from patch import patch
109
109
        from bzrlib.branch import Branch
110
110
        b = Branch.open_containing('.')[0]