Seeking ideas

[Jonathan Coxhead]

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

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe@...].
[jonathan.vcf]

---

begin:vcard
n:Coxhead;Jonathan
email;internet:jonathan@...
tel;home:[phone]
tel;cell:[phone]
x-mozilla-html:FALSE
version:2.1
end:vcard

---

[Mike Dixon-5]

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?

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.

-Mike

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe@...].

[Jonathan Coxhead]

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@...].
[jonathan.vcf]

---

begin:vcard
n:Coxhead;Jonathan
email;internet:jonathan@...
tel;home:[phone]
tel;cell:[phone]
x-mozilla-html:FALSE
version:2.1
end:vcard

---

[Daniel Torreblanca]

On Fri, Nov 6, 2009 at 6:27 PM, Jonathan Coxhead
<jonathan@...> 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@...].

[Henrik Sundberg]

On Sat, Nov 7, 2009 at 3:44 AM, Jonathan Coxhead
<jonathan@...> wrote:
> Mike Dixon wrote:
>> 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:

If you want to lose your local modifications, you shall use the revert command.

/$

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe@...].

[Vadym Chepkov]

svn status shows the status of the working directory.
It seems to me you ran 'svn merge' and this merge didn't contain any changes to the files, but it recorded the fact that merge was performed and populated property svn:merginfo.
You can commit this merge now with proper log entry and go along with your life :)

Vadym

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe@...].