##// END OF EJS Templates
Merge pull request #4141 from minrk/paul-was-wrong...
Thomas Kluyver -
r12346:af884b00 merge
parent child Browse files
Show More
@@ -70,16 +70,14 b" def backport_pr(branch, num, project='ipython/ipython'):"
70
70
71 filenames = [ f['filename'] for f in files ]
71 filenames = [ f['filename'] for f in files ]
72
72
73 commit = Popen(['git', 'commit', '-m', msg] + filenames)
73 check_call(['git', 'add'] + filenames)
74 commit.wait()
74
75 if commit.returncode:
75 check_call(['git', 'commit', '-m', msg])
76 print("commit failed!")
76
77 return 1
77 print("PR #%i applied, with msg:" % num)
78 else:
78 print()
79 print("PR #%i applied, with msg:" % num)
79 print(msg)
80 print()
80 print()
81 print(msg)
82 print()
83
81
84 if branch != current_branch:
82 if branch != current_branch:
85 check_call(['git', 'checkout', current_branch])
83 check_call(['git', 'checkout', current_branch])
General Comments 0
You need to be logged in to leave comments. Login now