← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to shelf.py

  • Committer: Alexander Belchenko
  • Date: 2006-06-15 11:00:55 UTC
  • mto: (0.6.1 shelf-win32)
  • mto: This revision was merged to the branch mainline in revision 414.
  • Revision ID: bialix@ukr.net-20060615110055-4e1f8e20a4d1f289
[win32] run patch utility with --binary flag on win32 to avoid problems with line-endings

Show diffs side-by-side

added added

removed removed

Lines of Context:
shelf.py
233
233
                    "working tree!")
234
234
 
235
235
    def _run_patch(self, patches, strip=0, reverse=False, dry_run=False):
236
 
        args = ['patch', '-d', self.base, '-s', '-p%d' % strip, '-f']
 
236
        if sys.platform != "win32":
 
237
            args = ['patch', '-d', self.base, '-s', '-p%d' % strip, '-f']
 
238
        else:
 
239
            args = ['patch', '-d', self.base, '--binary', '-s', '-p%d' % strip, '-f']
 
240
 
237
241
        if reverse:
238
242
            args.append('-R')
239
243
        if dry_run: