← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to shelf.py

Merge from ab-baz2bzr

Show diffs side-by-side

added added

removed removed

Lines of Context:
shelf.py
128
128
        return 1
129
129
 
130
130
def run_patch(branch_base, patches, reverse=False):
131
 
    args = ['patch', '-d', branch_base, '-s', '-p0', '-f']
 
131
    args = ['patch', '-d', branch_base, '-s', '-p1', '-f']
132
132
    if reverse:
133
133
        args.append('-R')
134
134
    process = Popen(args, stdin=PIPE)