Community
Participate
Working Groups
User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.1.2) Gecko/20090729 Firefox/3.5.2 (.NET CLR 3.5.30729) Build Identifier: When one creates a diff patch -- in Subclipse or any other tool -- where a change is "near" an expanded SVN keyword like Id, the local SVN base file does not contain the expanded keyword by design, so the diff file contains, for example a line with "$Id$" as an unchanged line between the two revisions. When it is time to apply the patch, the UI reports errors with the white cross on a red background icon and the patch cannot be 100% applied. Since the patch contains "$Id$ as an unchanged line and the local copy of the file contains the keyword expanded, the patch file and local file do not match. I use TortoiseSVN to apply patches as a workaround, which knows how to handle this situation. See http://www.mail-archive.com/tuscany-dev@ws.apache.org/msg30853.html for another explanation with a SVN diff doc reference. Reproducible: Always Steps to Reproduce: 1. Create a file that contains a SVN key work like Id, for example: "@version $Id$ " 2. Enable SVN keywords for Id on this file. 3. Commit to SVN 4. The local file has Id expanded as expected. 5. Now make changes near the line with Id 6. Create a diff patch file. 7. Replace the contents of the file with the SVN version which will loose your changes. 8. Apply the patch you just made. 9. You will see an error because the patch file contains "$Id$" and your local copy has the keyword expanded.
See informative comment from Subclipse: http://subclipse.tigris.org/issues/show_bug.cgi?id=990
This bug hasn't had any activity in quite some time. Maybe the problem got resolved, was a duplicate of something else, or became less pressing for some reason - or maybe it's still relevant but just hasn't been looked at yet. If you have further information on the current state of the bug, please add it. The information can be, for example, that the problem still occurs, that you still want the feature, that more information is needed, or that the bug is (for whatever reason) no longer relevant.
This bug hasn't had any activity in quite some time. Maybe the problem got resolved, was a duplicate of something else, or became less pressing for some reason - or maybe it's still relevant but just hasn't been looked at yet. As such, we're closing this bug. If you have further information on the current state of the bug, please add it and reopen this bug. The information can be, for example, that the problem still occurs, that you still want the feature, that more information is needed, or that the bug is (for whatever reason) no longer relevant. -- The automated Eclipse Genie.
