Page MenuHomeFreeBSD
Files F142894035

D37703.id114151.diff
No OneTemporary
Actions

D37703.id114151.diff
View Options

Index: usr.sbin/freebsd-update/freebsd-update.sh
===================================================================
--- usr.sbin/freebsd-update/freebsd-update.sh
+++ usr.sbin/freebsd-update/freebsd-update.sh
@@ -2543,8 +2543,21 @@
Press Enter to edit this file in ${EDITOR} and resolve the conflicts
manually...
EOF
- read dummy </dev/tty
- ${EDITOR} `pwd`/merge/new/${F} < /dev/tty
+ while true; do
+ read dummy </dev/tty
+ ${EDITOR} `pwd`/merge/new/${F} < /dev/tty
+
+ if ! egrep -q $(pwd)/merge/new/${F} '^<<<<<<<|^=======|^>>>>>>>'; then
+ break
+ fi
+ cat <<-EOF
+
+Merge conflict markers remain in: ${F}
+These must be resolved for the system to be functional.
+
+Press Enter to return to editing this file.
+ EOF
+ done
done < failed.merges
rm failed.merges

File Metadata

Mime Type
text/plain
Expires
Sun, Jan 25, 1:07 PM (7 h, 34 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27942110
Default Alt Text
D37703.id114151.diff (810 B)

Event Timeline