Revision: 12560
Author: [email protected]
Date: Thu Sep 20 01:02:17 2012
Log: Wait for resolving conflicts in merge-to-branch script.
[email protected]
Review URL: https://chromiumcodereview.appspot.com/10939033
http://code.google.com/p/v8/source/detail?r=12560
Modified:
/branches/bleeding_edge/tools/common-includes.sh
=======================================
--- /branches/bleeding_edge/tools/common-includes.sh Fri Apr 13 09:00:31
2012
+++ /branches/bleeding_edge/tools/common-includes.sh Thu Sep 20 01:02:17
2012
@@ -179,11 +179,24 @@
read ANSWER
done
}
+
+wait_for_resolving_conflicts() {
+ echo "Applying the patch failed. Either type \"ABORT<Return>\", or \
+resolve the conflicts, stage the touched files with 'git add' and \
+type \"RESOLVED<Return>\""
+ unset ANSWER
+ while [ "$ANSWER" != "RESOLVED" ] ; do
+ [[ "$ANSWER" == "ABORT" ]] && die "Applying the patch failed."
+ [[ -n "$ANSWER" ]] && echo "That was not 'RESOLVED' or 'ABORT'."
+ echo -n "> "
+ read ANSWER
+ done
+}
# Takes a file containing the patch to apply as first argument.
apply_patch() {
patch $REVERSE_PATCH -p1 < "$1" > "$PATCH_OUTPUT_FILE" || \
- { cat "$PATCH_OUTPUT_FILE" && die "Applying the patch failed."; }
+ { cat "$PATCH_OUTPUT_FILE" && wait_for_resolving_conflicts; }
tee < "$PATCH_OUTPUT_FILE" >(grep "patching file" \
| awk '{print $NF}'
"$TOUCHED_FILES_FILE")
rm "$PATCH_OUTPUT_FILE"
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
