On Sep 3, 2009, at 8:49 AM, David Carson wrote:
>> David Carson wrote on Wed, 2 Sep 2009 at 21:24 -0700:
>>>> On Thu, Sep 3, 2009 at 1:48 PM, David Carson <dccarson_at_yahoo.com>
>>>> wrote:
>>>>
>>>>> We are occasionally seeing a commit which includes the modified
>>>>> files and
>>>>> one or more unmodified file(s). How is this possible?
>>>>>
>>>>> $ svnlook changed -r 496 /export/svn/merlin
>>>>> U top/branches/v12/code/type.c
>>>>> U top/branches/v12/tools/crashfmt
>>>>>
>>>>> $ svnlook diff -r 496 /export/svn/merlin | grep "^Modified"
>>>>> Modified: top/branches/v12/code/type.c
>>>>>
>>>>> As you can see, the commit seems to contain textual changes to
>>>>> two files
>>>>> ('U' is in column 1). However, when I diff the files, only one
>>>>> of them has
>>>>> truly changed. I have tried to see the diff to crashfmt in
>>>>> other ways as
>>>>> well, using command line client, viewVc, etc. All agree that
>>>>> (a) it was
>>>>> part of the commit and (b) it was not changed.
>>>>>
>>
>> I'd extract the two individual versions of the file and compare them
>> manually:
>>
>> svn checkout -r 495 wc1
>> svn checkout -r 496 wc2
>> cmp wc1/.svn/text-base/crashfmt.svn-base wc2/.svn/text-base/
>> crashfmt.svn-base
>
> Done. They are identical.
>
Are the svn: properties on both revisions identical? If you run 'svn
diff' instead of cmp, you may be able to see differences in a property
value.
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2391023
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-04 16:04:13 CEST