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 18:42:33 UTC
[Fwd: Re: merge and properties]
> Okay I take it back. I was able to get the command that Philip
> recommended to work (I had reversed the revno's). I gather that was
> actually the problem with my first version of the command too.
>
> duh...
>
>
> rvs
>
> On Fri, 2002-11-22 at 13:23, Ronald V. Simmons wrote:
> > 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
> >
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [Fwd: Re: merge and properties]
Posted by Ben Collins-Sussman <su...@collab.net>.
ketil@ii.uib.no (Ketil Z. Malde) writes:
> Philip Martin <ph...@codematters.co.uk> writes:
>
> > Be careful... to move changes from one branch to another the
> >
> > svn merge -rREV1:REV URL PATH
> >
> > form is preferred,
>
> I think merging is a subject that deserves a bit more attention. In
> particular, the documentation might be clearer that the above is what
> you usually want (and it is, isn't it?).
I just committed a completely rewritten and expanded chapter on
branching and merging. Take a look at doc/book/book/ch04.xml, see if
it's clearer now.
> I think most merging is going to be either incorporating/reversing a
> single or small set of changes, for which the above is good, or
> incorporating all changes in a branch into the trunk (or another
> branch). Could there be a default action for this (without the need
> to check revsion numbers etc)?
Not until Subversion starts automatically tracking merge information.
See the "repeated merge" sidebar in ch04.xml.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [Fwd: Re: merge and properties]
Posted by "Ketil Z. Malde" <ke...@ii.uib.no>.
Philip Martin <ph...@codematters.co.uk> writes:
> Be careful... to move changes from one branch to another the
>
> svn merge -rREV1:REV URL PATH
>
> form is preferred,
I think merging is a subject that deserves a bit more attention. In
particular, the documentation might be clearer that the above is what
you usually want (and it is, isn't it?).
I think most merging is going to be either incorporating/reversing a
single or small set of changes, for which the above is good, or
incorporating all changes in a branch into the trunk (or another
branch). Could there be a default action for this (without the need
to check revsion numbers etc)?
Additionally, the svn merge command should perhaps also be more
careful in what it allows, perhaps asking for confirmation for the
rarer cases?
-kzm
--
If I haven't seen further, it is by standing in the footprints of giants
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [Fwd: Re: merge and properties]
Posted by Philip Martin <ph...@codematters.co.uk>.
"Ronald V. Simmons" <Va...@thesimmonses.net> writes:
> > On Fri, 2002-11-22 at 13:23, Ronald V. Simmons wrote:
> > > 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. :^)
> > > >
> > > > You probably want to run a command like
> > > >
> > > > svn merge -rREV1:REV2 http://myserver/repository/Development ~rvs/Experimental
> > >
> > > Yields exactly the same result.
> >
> > Okay I take it back. I was able to get the command that Philip
> > recommended to work (I had reversed the revno's). I gather that was
> > actually the problem with my first version of the command too.
Be careful... to move changes from one branch to another the
svn merge -rREV1:REV URL PATH
form is preferred, the two URL form of the command only works because
you have no changes committed on your working copy branch. If you had
committed changes to the working copy branch then the two URL command
would undo those changes as well as merging the changes from the other
branch. (Unless of course you play games with @REV, but if you are
going to do that you may as well use the -rREV1:REV2 form.)
--
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org