Attachment 13580 Details for Bug 25771 – file.diff

[patch] file.diff

file.diff (text/plain), 1.24 KB, created by k on 2001-03-13 13:30:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: k

Created: 2001-03-13 13:30:01 UTC

Size: 1.24 KB

patch

obsolete

>--- mergemaster.orig	Tue Mar 13 13:54:11 2001
>+++ mergemaster	Tue Mar 13 14:21:45 2001
>@@ -31,6 +31,7 @@
>   echo "  -u N  Specify a numeric umask"
>   echo "  -w N  Specify a screen width in columns to sdiff"
>   echo '  -D /path/directory  Specify the destination directory to install files to'
>+  echo '  -V do not view diffs by default'
>   echo ''
> }
> 
>@@ -103,7 +104,7 @@
> # options
> diff_loop () {
> 
>-  HANDLE_COMPFILE=v
>+  HANDLE_COMPFILE=${VIEW_DIFF}
> 
>   while [ "${HANDLE_COMPFILE}" = "v" -o "${HANDLE_COMPFILE}" = "V" -o "${HANDLE_COMPFILE}" = "NOT V" ]; do
>     if [ -f "${DESTDIR}${COMPFILE#.}" -a -f "${COMPFILE}" ]; then
>@@ -225,7 +226,7 @@
> 
> # Check the command line options
> #
>-while getopts ":ascrvhim:t:du:w:D:" COMMAND_LINE_ARGUMENT ; do
>+while getopts ":ascrvhim:t:du:w:D:V" COMMAND_LINE_ARGUMENT ; do
>   case "${COMMAND_LINE_ARGUMENT}" in
>   s)
>     STRICT=yes
>@@ -271,6 +272,9 @@
>   D)
>     DESTDIR=${OPTARG}
>     ;;
>+  V)
>+    VIEW_DIFF="NOT V"
>+    ;;
>   *)
>     display_usage
>     exit 1
>@@ -343,6 +347,10 @@
> # Assign the diff flag once so we will not have to keep testing it
> #
> DIFF_FLAG=${DIFF_FLAG:--u}
>+
>+# Assign the choice to view diff so we will not have to keep testing it
>+#
>+VIEW_DIFF=${VIEW_DIFF:-v}
> 
> # Assign the source directory
> #

Actions: View | Diff

Attachments on bug 25771: 13580