Diff does not flag manual edits to Keyword text

20 views
Skip to first unread message

Chris M

unread,
May 19, 2020, 11:19:11 AM5/19/20
to TortoiseSVN
I have a CSV file that is generated out of some design software. I have added the file to my SVN repo along with the keyword:id property. On the server the file has the ID string substituted correctly.

My issue comes about when when the file is regenerated, since it clears out the $Id$ string. If the rest of the file contents match, Tortoise Diff doesn't flag the file as modified. That means the file could be sent out missing the ID string.

Diff with URL correctly shows the line is modified (WC on the left):

wc_diff_url.png

But 'Check for modifications' shows nothing, and there is no 'Diff' or 'Revert' option in the context menu:

wc_context_menu.png

wc_check_mods.png


Performing an Update doesn't 'revert' that line either (unless someone else makes a commit). How can I get the file to be flagged, or at least revert it? I could make some other file change and then perform a revert, but at the moment it hides that the file is actually different to the repo.

Stefan

unread,
May 19, 2020, 2:00:43 PM5/19/20
to TortoiseSVN
svn doesn't consider changes in an expanded keyword as a committable change, so the svn status is not 'modified' but still 'normal'.

SgtGumby216

unread,
May 19, 2020, 10:05:33 PM5/19/20
to TortoiseSVN
Hi Stefan,
Yes, I know that SVN views this as not really a change, however the file is textually different to the copy on the server. My issue is when I go to send this file for manufacture (it's a bill of materials) the ID string isn't included because the design software cleared out the string when regenerating.

Aside from manually checking the file against the server each time (in this situation), can I force my working copy to pull the ID string from the server or revert the string? I happened to catch this because I was expecting the file contents (outside the ID string) to change but it didn't, so I investigated. My co-workers sometimes struggle with version control, so they might send out files that are missing ID strings because they see no local modifications.

Chris.
Reply all
Reply to author
Forward
0 new messages