[llvm-branch-commits] [cfe-branch] r214778 - Merging r214777:

[Bill Wendling]

On Aug 4, 2014, at 2:29 PM, Hans Wennborg <hans at chromium.org> wrote:

> On Mon, Aug 4, 2014 at 2:11 PM, Hans Wennborg <hans at hanshq.net> wrote:
>> Author: hans
>> Date: Mon Aug  4 16:11:53 2014
>> New Revision: 214778
>> 
>> URL: http://llvm.org/viewvc/llvm-project?rev=214778&view=rev
>> Log:
>> Merging r214777:
>> 
>> Excluding the /Zp option, because that was added after the 3.5 branch.
>> 
>> ------------------------------------------------------------------------
>> r214777 | hans | 2014-08-04 14:07:58 -0700 (Mon, 04 Aug 2014) | 1 line
>> 
>> UsersManual: update clang-cl options
>> ------------------------------------------------------------------------
>> 
>> Modified:
>>    cfe/branches/release_35/   (props changed)
>>    cfe/branches/release_35/docs/UsersManual.rst
>>    cfe/branches/release_35/test/Analysis/MismatchedDeallocator-checker-test.mm   (props changed)
>>    cfe/branches/release_35/test/Analysis/NewDelete-checker-test.cpp   (props changed)
>>    cfe/branches/release_35/test/SemaCXX/warn-unreachable.cpp   (props changed)
> 
> Weird.. I have no idea why it committed props changes to files in
> test/, that was certainly not my intention.
> 
> Since it's just metadata, maybe I can treat it as benign, or do you
> think I should try to revert that part of the commit?

This happens all the time with ‘svn merge’. It’s a mystery to me. You can ignore it (I do :-).

-bw