[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

merge and properties

From: Ronald V. Simmons <Van_Simmons_at_thesimmonses.net>
Date: 2002-11-22 17:58:12 CET

I'm confused about behavior I'm getting from svn merge. This is with a
client compiled this morning from R3850 on RedHat-8.0.

Yesterday I forked a new branch called Experimental from a branch called
Development via 'svn cp'. To date only one change has been made to
Development, i.e. adding the svn:executable property to a bunch of perl
files.

I have a working copy synced to HEAD of Experimental and observe the
following:

=============================================================
> svn merge http://myserver/repository/Development
http://myserver/repository/Experimental ~rvs/Experimental
rvs's password:

[snip a bunch of lines just like this]
 U /home/rvs/Experimental/Perl/Masters/RunAll.pl
=============================================================

Which I interpret to mean that the WC is getting its properties updated
exactly as I would expect. I'm somewhat puzzled by the following,
though:

=============================================================
rvs 11:53:09 ~/Experimental>svn info Perl/Masters/RunAll.pl
Path: Perl/Masters/RunAll.pl
Name: RunAll.pl
Url: http://myserver/repository/Experimental/Perl/Masters/RunAll.pl
Revision: 1908
Node Kind: file
Schedule: normal
Last Changed Author: rvs
Last Changed Rev: 3
Last Changed Date: 2002-05-10 16:02:54 -0400 (Fri, 10 May 2002)
Text Last Updated: 2002-11-21 13:04:44 -0500 (Thu, 21 Nov 2002)
Properties Last Updated: 2002-11-21 15:13:40 -0500 (Thu, 21 Nov 2002)
Checksum: A8s22cu/ROpu50CNkGKEdw==

rvs 11:53:50 ~/Experimental>svn st Perl/Masters/RunAll.pl
       Perl/Masters/RunAll.pl
rvs 11:54:01 ~/Experimental>svn commit -m"nothing happens"
Perl/Masters/RunAll.pl
=============================================================

Which says that there are no changes to the properties of the file in
the WC and no changes to commit, even though the merge command said it
did change the properties. Is this the expected behavior and am I
missing something? I can't find any issues that look like this..

rvs

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Nov 22 17:54:24 2002

This is an archived mail posted to the Subversion Dev mailing list.