On Fri, Nov 6, 2009 at 6:27 PM, Jonathan Coxhead
<jonathan_at_doves.demon.co.uk> wrote:
> I am new to Subversion, so I'm looking for ideas to investigate that
> might be obvious to an experienced user.
>
> I have a strange situation. I have a directory of files, and they
> show as modified
>> $ svn status
>> M .
>> M readme_TimeDoctor2009.txt
>> M probe.dll
>> M ethProbe.dll
>> ...
> (My ellipsis---there are a lot more files.) By the way, I'm using
> Cygwin for this bit
>> $ svn --version
>> svn, version 1.6.6 (r40053)
>> compiled Oct 22 2009, 20:07:57
>>
>> Copyright (C) 2000-2009 CollabNet.
> and TortoiseSVN 1.6.6 2009/08/31 01:13:53 (r17052) for everything else.
>
> So to bring them up to date, I update:
>> $ svn update
>> At revision 38099.
> Took a while, but what did it do?
>> $ svn status
>> M .
>> M readme_TimeDoctor2009.txt
>> M probe.dll
>> M ethProbe.dll
>> ...
> Nothing at all! (Just what Tortoise did, which is why I went to the CLI.)
>
> What were the differences?
>> $ svn diff
>>
>> Property changes on: .
>> ___________________________________________________________________
>> Modified: svn:mergeinfo
>> Merged
>> /nhsw/Users/jonathan/Ready/nhswWithTssaFixes/tool/hosttarget/bin:r38045-38090
>> Merged /nhsw/Users/jonathan/Work/nhsw/tool/hosttarget/bin:r37075-38044
>>
>>
>> Property changes on: readme_TimeDoctor2009.txt
>> ___________________________________________________________________
>> Modified: svn:mergeinfo
>> Merged
>> /nhsw/Users/jonathan/Ready/nhswWithTssaFixes/tool/hosttarget/bin/readme_TimeDoctor2009.txt:r38045-38090
>> Merged
>> /nhsw/Users/jonathan/Work/nhsw/tool/hosttarget/bin/readme_TimeDoctor2009.txt:r37075-38044
>>
>>
>> Property changes on: probe.dll
>> ___________________________________________________________________
>> Modified: svn:mergeinfo
>> Merged
>> /nhsw/Users/jonathan/Ready/nhswWithTssaFixes/tool/hosttarget/bin/probe.dll:r38045-38090
>> Merged
>> /nhsw/Users/jonathan/Work/nhsw/tool/hosttarget/bin/probe.dll:r37075-38044
>>
>>
>> Property changes on: ethProbe.dll
>> ___________________________________________________________________
>> Modified: svn:mergeinfo
>> Merged
>> /nhsw/Users/jonathan/Ready/nhswWithTssaFixes/tool/hosttarget/bin/ethProbe.dll:r38045-38090
>> Merged
>> /nhsw/Users/jonathan/Work/nhsw/tool/hosttarget/bin/ethProbe.dll:r37075-38044
> 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?
>
> Any ideas would be useful. Thanks much
>
> --
> Jonathan Coxhead
I'm not sure I understand you're situation. Do you only have one
working copy, and you're using both the command line svn client and
TortoiseSVN for different purposes on the same WC? When you run "svn
status" it will only show you LOCAL changes. Use "svn status -u" to
show changes in the repository. From what you've described, it looks
like your files are modified locally in which case an "svn update"
wouldn't do anything.
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2415351
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-11-07 09:40:55 CET