FreeBSD Bugzilla – Attachment 196606 Details for
Bug 230955
[patch] Some speedup mergemaster
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
patch-mergemaster
patch-mergemaster (text/plain), 607 bytes, created by
Dmitry Wagin
on 2018-08-27 17:19:04 UTC
(
hide
)
Description:
patch-mergemaster
Filename:
MIME Type:
Creator:
Dmitry Wagin
Created:
2018-08-27 17:19:04 UTC
Size:
607 bytes
patch
obsolete
>--- usr.sbin/mergemaster/mergemaster.sh.orig >+++ usr.sbin/mergemaster/mergemaster.sh >@@ -1121,8 +1121,8 @@ > # 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. > # >- ID1=`grep "[$]${ID_TAG}:" ${DESTDIR}${COMPFILE#.} 2>/dev/null` >- ID2=`grep "[$]${ID_TAG}:" ${COMPFILE} 2>/dev/null` || ID2=none >+ ID1=`grep -m1 -o "[$]${ID_TAG}:[^$]*[$]" ${DESTDIR}${COMPFILE#.} 2>/dev/null` >+ ID2=`grep -m1 -o "[$]${ID_TAG}:[^$]*[$]" ${COMPFILE} 2>/dev/null` || ID2=none > > case "${ID2}" in > "${ID1}")
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=196606">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 230955
:
196605
| 196606