Show More
@@ -324,6 +324,7 b' the hunk is left unchanged.' | |||||
324 | """) |
|
324 | """) | |
325 | (patchfd, patchfn) = tempfile.mkstemp(prefix="hg-editor-", |
|
325 | (patchfd, patchfn) = tempfile.mkstemp(prefix="hg-editor-", | |
326 | suffix=".diff", text=True) |
|
326 | suffix=".diff", text=True) | |
|
327 | ncpatchfp = None | |||
327 | try: |
|
328 | try: | |
328 | # Write the initial patch |
|
329 | # Write the initial patch | |
329 | f = os.fdopen(patchfd, "w") |
|
330 | f = os.fdopen(patchfd, "w") |
@@ -919,7 +919,7 b' Editing patch' | |||||
919 |
|
919 | |||
920 | $ cat > editor << '__EOF__' |
|
920 | $ cat > editor << '__EOF__' | |
921 | > #!/bin/sh |
|
921 | > #!/bin/sh | |
922 | > sed -i -e 7d -e '5s/^-/ /' "$1" |
|
922 | > sed -i.bak -e 7d -e '5s/^-/ /' "$1" | |
923 | > __EOF__ |
|
923 | > __EOF__ | |
924 | $ chmod +x editor |
|
924 | $ chmod +x editor | |
925 | $ cat > editedfile << '__EOF__' |
|
925 | $ cat > editedfile << '__EOF__' |
General Comments 0
You need to be logged in to leave comments.
Login now