Mike Dixon wrote:
> Jonathan Coxhead wrote:
>
>> Quite a lot, all of them properties. But somehow not noticed by update?
>>
>> This work area was created by using the TortoiseSVN client to merge
>> in a side branch back to the main branch. I could have made a mistake
>> there, but looking at what's above in isolation, it doesn't seem to be
>> following the rules for "update" and "status". What am I not understanding?
>>
>
> What do you think should happen instead of what you saw?
>
I would expect "update" to make my working copy a replica of the
repository, if "status" claimed it was modified. So my expectation would
be that one of the following were true:
---Either "status" would show no modifications and "update" would no
nothing;
---Or "status" would show that the properties were modified, and
"update" would bring them over to my work area.
Looking further, I've just realised that the "M"s I see are in column
1, not column 0; that is how I can tell that the modification is to
properties not to the text. It's a little subtle, so I missed it initially.
> Generally, "svn update" just updates your working copy with changes that
> have been made on the server. It doesn't alter properties unless someone
> committed a change to them.
>
Is there an option to make it do so? I'll have a look.
> -Mike
>
---Cheers
Jonathan Coxhead
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2415323
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-11-07 06:27:39 CET