|
Lines 1121-1128
Link Here
|
| 1121 |
# If the files have the same $Id, delete the one in temproot so the |
1121 |
# If the files have the same $Id, delete the one in temproot so the |
| 1122 |
# user will have less to wade through if files are left to merge by hand. |
1122 |
# user will have less to wade through if files are left to merge by hand. |
| 1123 |
# |
1123 |
# |
| 1124 |
ID1=`grep "[$]${ID_TAG}:" ${DESTDIR}${COMPFILE#.} 2>/dev/null` |
1124 |
ID1=`grep -m1 -o "[$]${ID_TAG}:[^$]*[$]" ${DESTDIR}${COMPFILE#.} 2>/dev/null` |
| 1125 |
ID2=`grep "[$]${ID_TAG}:" ${COMPFILE} 2>/dev/null` || ID2=none |
1125 |
ID2=`grep -m1 -o "[$]${ID_TAG}:[^$]*[$]" ${COMPFILE} 2>/dev/null` || ID2=none |
| 1126 |
|
1126 |
|
| 1127 |
case "${ID2}" in |
1127 |
case "${ID2}" in |
| 1128 |
"${ID1}") |
1128 |
"${ID1}") |