Attachment 12790 Details for Bug 24564 – file.diff

[patch] file.diff

file.diff (text/plain), 1.67 KB, created by Tony Finch on 2001-01-22 23:30:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tony Finch

Created: 2001-01-22 23:30:02 UTC

Size: 1.67 KB

patch

obsolete

>Index: mergemaster.sh
>===================================================================
>RCS file: /home/ncvs/src/usr.sbin/mergemaster/mergemaster.sh,v
>retrieving revision 1.6.2.5
>diff -u -r1.6.2.5 mergemaster.sh
>--- mergemaster.sh	2000/11/09 00:51:38	1.6.2.5
>+++ mergemaster.sh	2001/01/22 23:09:56
>@@ -671,21 +669,24 @@
> 
>   case "${STRICT}" in
>   '' | [Nn][Oo])
>-    # Compare CVS $Id's first so if the file hasn't been modified
>-    # local changes will be ignored.
>-    # If the files have the same $Id, delete the one in temproot so the
>-    # user will have less to wade through if files are left to merge by hand.
>+    # Ignore local changes unless the source file has changed, which
>+    # we detect by looking at ident strings:
>+    # If the destination file has all of the ident strings of the
>+    # temproot file, then delete the temproot file so the user will
>+    # have less to wade through if files are left to merge by hand.
>+    # We allow the user to add local ident strings which are ignored.
>     #
>-    # Reduce complexity and improve portability by using ident
>-    #
>-    CVSID1=`ident ${DESTDIR}${COMPFILE#.} 2>&1`
>-    CVSID1="${CVSID1#${DESTDIR}}"
>-    CVSID2=`ident ${COMPFILE} 2>&1`
>-
>-    case "${CVSID2}" in
>-    *'no id keywords'*)
>-      ;;
>-    ."${CVSID1}")
>+    ALL_PRESENT=YES
>+    ident ${COMPFILE} 2>&1 | {
>+      read DISCARD_FILENAME
>+      while read IDENT_STRING; do
>+        if ident ${DESTDIR}${COMPFILE#.} 2>&1 | fgrep -qv "${IDENT_STRING}"; then
>+          ALL_PRESENT=NO
>+        fi
>+      done	
>+    }
>+    case "${ALL_PRESENT}" in
>+    [Yy][Es][Ss])
>       echo " *** Temp ${COMPFILE} and installed have the same CVS Id, deleting"
>       rm "${COMPFILE}"
>       ;;

Actions: View | Diff

Attachments on bug 24564: 12790