Login | Register
My pages Projects Community openCollabNet

Discussions > issues > [Issue 990] New - Apply Patch does should ignore expanded SVN keywords.

subclipse
Discussion topic

Back to topic list

[Issue 990] New - Apply Patch does should ignore expanded SVN keywords.

Author ggregory
Full name Gary D. Gregory
Date 2009-09-03 09:51:00 PDT
Message http://subclipse.tig​ris.org/issues/show_​bug.cgi?id=990
                 Issue #|990
                 Summary|Apply Patch does should ignore expanded SVN keywords.
               Component|subclipse
                 Version|current
                Platform|All
              OS/Version|Windows XP
                     URL|
                  Status|NEW
       Status whiteboard|
                Keywords|
              Resolution|
              Issue type|DEFECT
                Priority|P3
            Subcomponent|UI
             Assigned to|issues@subclipse
             Reported by|ggregory






------- Additional comments from ggregory at tigris dot org Thu Sep 3 09:51:00 -0700 2009 -------
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, 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-arch​ive.com/tuscany-dev@​ws.apache.org/msg308​53.html for
another explanation with SVN diff doc reference.

« Previous message in topic | 1 of 5 | Next message in topic »

Messages

Show all messages in topic

[Issue 990] New - Apply Patch does should ignore expanded SVN keywords. ggregory Gary D. Gregory 2009-09-03 09:51:00 PDT
     [Issue 990] Apply Patch does should ignore expanded SVN keywords. markphip Mark Phippard 2009-09-03 10:19:35 PDT
     [Issue 990] Apply Patch should ignore expanded SVN keywords. ggregory Gary D. Gregory 2009-09-03 11:42:32 PDT
     [Issue 990] Apply Patch should ignore expanded SVN keywords. ggregory Gary D. Gregory 2009-09-03 11:52:47 PDT
     [Issue 990] Apply Patch should ignore expanded SVN keywords. selsemore Stephen Elsemore 2010-01-14 09:55:52 PST
Messages per page: