>Number: 172320
>Category: misc
>Synopsis: [PATCH] Change CVS IS to SVN Rev in mergemaster
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Oct 04 08:00:28 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Chris Petrik
>Release: FreeBSD 10-CURRENT
>Organization:
none
>Environment:
FreeBSD slappy.nohost 10.0-CURRENT FreeBSD 10.0-CURRENT #0 r241169: Wed Oct 3
22:55:59 CDT 2012 [email protected]:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
Upgrading my dev box to 10 current and doing mergemaster I noticed that it
still mentions CVS ID: when I think it should say SVN Rev:
>How-To-Repeat:
Small patch as supplied
>Fix:
Not a real problem more of a annoyance :)
Patch attached with submission follows:
Index: mergemaster/mergemaster.sh
===================================================================
--- mergemaster/mergemaster.sh (revision 241183)
+++ mergemaster/mergemaster.sh (working copy)
@@ -1105,7 +1105,7 @@
case "${CVSID2}" in
"${CVSID1}")
- echo " *** Temp ${COMPFILE} and installed have the same CVS Id, deleting"
+ echo " *** Temp ${COMPFILE} and installed have the same SVN Rev.,
deleting"
rm "${COMPFILE}"
;;
esac
>Release-Note:
>Audit-Trail:
>Unformatted:
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "[email protected]"
