[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Edit working copy while see the 'diff'

From: Steven Woody <narkewoody_at_gmail.com>
Date: Sat, 6 Dec 2008 03:57:25 +0800

On Sat, Dec 6, 2008 at 3:43 AM, Ryan Schmidt
<subversion-2008c_at_ryandesign.com> wrote:
> On Dec 5, 2008, at 13:40, Steven Woody wrote:
>
>> On Sat, Dec 6, 2008 at 3:06 AM, Ryan Schmidt
>> <subversion-2008c_at_ryandesign.com> wrote:
>>>
>>> On Dec 5, 2008, at 12:58, Steven Woody wrote:
>>>
>>>> Hi, let me make it clear: sometimes 'svn diff' command will generate
>>>> a file /tmp/svndiff.tmp as the right hand side file, and passwd the
>>>> name of the file to used defined external diff command such as
>>>> vimdiff. Could anyone tell me why this happend and how to avoid it.
>>>
>>> I believe I remember someone saying this happens only when you have used
>>> the
>>> svn:eol-style property on the file, but I have not tested this.
>>
>> Yes, the file is a .c source file and I used the "*.c =
>> svn:eol-style=native" line in my .subversion/config. but even after I
>> commented the config line, the /tmp/svndiff.tmp is still be generated.
>
> That line in the config file is in the auto-props section. It means the
> properties will be automatically added to new files when they're added to
> the repository. Now that your file is in the repository, changing that line
> in the config file has no effect for it. If you want to test this, you will
> have to actually remove the svn:eol-style property from the file in
> question.
>
>

Than you. I tested and the result is that the svn:eol-style property
has nothing to do with the problem, it is the "svn:keywords" property
and set on this file caused the strange behavior. After I removed the
"svn:keywords" property, 'svn diff' will give me expected result. But
I need my source files have a "svn:keywords" property, so I can add
$Id$ in each of these file. I still don't understand why the
"svn:keywords" property conflict with "svn diff' behavior. Do you
experts get a solution? Thanks in advance.

-
narke

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=980311

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2008-12-08 09:04:24 CET

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.