FreeBSD Bugzilla – Attachment 13553 Details for
Bug 25731
mergemaster -a is not automatic when it finds a file that is missing
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 553 bytes, created by
ggong
on 2001-03-12 11:20:01 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
ggong
Created:
2001-03-12 11:20:01 UTC
Size:
553 bytes
patch
obsolete
>--- mergemaster.orig.sh Mon Mar 12 03:01:05 2001 >+++ mergemaster.sh Mon Mar 12 03:07:15 2001 >@@ -675,8 +675,17 @@ > # diff_loop function knows how to handle it. > # > if [ ! -e "${DESTDIR}${COMPFILE#.}" ]; then >- diff_loop >- continue >+ case "${AUTO_RUN}" in >+ '') >+ diff_loop >+ continue >+ ;; >+ *) >+ # If this is an auto run, make it official >+ echo " *** ${COMPFILE} will remain for your consideration" >+ continue >+ ;; >+ esac # Auto run test > fi > > case "${STRICT}" in
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=13553">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 25731
: 13553