cvs merging - conflict

[Feldmann, Rick]

I read somewhere that cvs update uses diff to figure out modifications to
the files.  However, it doesn't appear to use the same diff as cvs diff -
Part of it is the white space issue, and there doesn't appear to be and
option in update to ignore white space.  However, regardless of how I cvs
diff the file, I get the same result show below.  I did some searching and
found the patch program, which is fine, if you want all of the branch
changes put into the trunk, but you will lose the trunk changes and that
isn't going to work.  More to the point of this particular problem, cvs
update flagged the entire file as changed, and cvs diff only flagged the
changes.  Why?

listProducts.jsp - The branch version looks like this:

<%@ taglib uri="http://java.sun.com/jstl/core"; prefix="c" %>
<!-- Hello Rick -->
<table>
<c:forEach items="${productList.products}" var="product">
   <tr>
      <td><a href="UpdateProduct.do?code=<c:out value="${product.code}"
/>"><c:out value="${product.title}" /></a></td>
      <td><c:out value="${product.artist}" /></td>
   </tr>
</c:forEach>
</table>


The trunk version looks like this:

<%@ taglib uri="http://java.sun.com/jstl/core"; prefix="c" %>
<!-- Jim mods -->

<table>
<c:forEach items="${productList.products}" var="product">
   <tr>
      <td><a href="UpdateProduct.do?code=<c:out value="${product.code}"
/>"><c:out value="${product.title}" /></a></td>
      <td><c:out value="${product.artist}" /></td>
   </tr>
</c:forEach>
</table>


When I perform a merge from the branch to the trunk I get:

<<<<<<< listProducts.jsp
<%@ taglib uri="http://java.sun.com/jstl/core"; prefix="c" %>
<!-- Jim mods -->

<table>
<c:forEach items="${productList.products}" var="product">
   <tr>
      <td><a href="UpdateProduct.do?code=<c:out value="${product.code}"
/>"><c:out value="${product.title}" /></a></td>
      <td><c:out value="${product.artist}" /></td>
   </tr>
</c:forEach>
</table>
=======
<%@ taglib uri="http://java.sun.com/jstl/core"; prefix="c" %>
<!-- Hello Rick -->
<table>
<c:forEach items="${productList.products}" var="product">
   <tr>
      <td><a href="UpdateProduct.do?code=<c:out value="${product.code}"
/>"><c:out value="${product.title}" /></a></td>
      <td><c:out value="${product.artist}" /></td>
   </tr>
</c:forEach>
</table>
>>>>>>> 1.2.2.1


When I perform a cvs diff on the files I get this:

Index: jsp/listProducts.jsp
===================================================================
RCS file: /usr/local/cvs/feldmann/jsp/listProducts.jsp,v
retrieving revision 1.4
retrieving revision 1.2.2.1
diff -b -w -r1.4 -r1.2.2.1
2,3c2
< <!-- Jim mods -->
< 
---
> <!-- Hello Rick -->


Rick Feldmann
Technical Development Advisor
Amisys Synertech Inc.
<mailto:address@hidden>
Phone: 301-315-7268

"Confidentiality Notice:  The information contained in this transmission is
confidential, proprietary, or privileged and may be subject to protection
under the Health Insurance Portability and Accountability Act of 1996 or
other legal sanction.  The message is intended for the sole use of the
individual or entity to whom it is addressed.  If you are not the intended
recipient, you are notified that any review, use, disclosure, distribution,
or copying of the message or its contents is strictly prohibited and may
subject you to criminal or civil penalty.  If you are not the intended
recipient, please contact the sender by reply e-mail and destroy all copies
of the original message."