You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by "Ronald V. Simmons" <Va...@thesimmonses.net> on 2002/11/22 16:58:12 UTC
merge and properties
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
Re: merge and properties
Posted by "Ronald V. Simmons" <Va...@thesimmonses.net>.
On Fri, 2002-11-22 at 12:53, Philip Martin wrote:
> "Ronald V. Simmons" <Va...@thesimmonses.net> writes:
>
> > > svn merge http://myserver/repository/Development
> > http://myserver/repository/Experimental ~rvs/Experimental
> > rvs's password:
>
> This command does not do what you think it does :)
>
Clearly. :^)
What I -thought- it did was diff all the contents of
/repository/Development against the current contents of
/repository/Experimental and apply those diffs to the current contents
of ~rvs/Experimental.
The output that I get is exactly what I would have expected from that
operation, specifically that everything which had its svn:executable
property changed on Development after the branch, received that update
in ~rvs/Experimental.
I guess what I'm missing is what it means to have the U in the second
column of the output if a property in my WC is not actually being
updated? I assume that it means it would be updated in some
circumstance, I just can't figure out what that circumstance would be if
it is not 'svn merge'.
> > [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.
>
> No, it means that the change to convert the first URL into the second
> URL does not conflict with your working copy. It does not conflict
> because it is a trivial merge, the change is already present.
>
> You probably want to run a command like
>
> svn merge -rREV1:REV2 http://myserver/repository/Development ~rvs/Experimental
Yields exactly the same result.
rvs
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: merge and properties
Posted by Philip Martin <ph...@codematters.co.uk>.
"Ronald V. Simmons" <Va...@thesimmonses.net> writes:
> > svn merge http://myserver/repository/Development
> http://myserver/repository/Experimental ~rvs/Experimental
> rvs's password:
This command does not do what you think it does :)
> [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.
No, it means that the change to convert the first URL into the second
URL does not conflict with your working copy. It does not conflict
because it is a trivial merge, the change is already present.
You probably want to run a command like
svn merge -rREV1:REV2 http://myserver/repository/Development ~rvs/Experimental
--
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org