You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Skip Montanaro <sk...@pobox.com> on 2009/09/02 19:40:20 UTC
I don't understand the merge command at all...
svn merge seems to defeat my minimal understanding of how Subversion
works. Case in point. I have a branch, call it branches/A. This
morning I branched from it:
svn copy branches/A branches/B
I made some changes to B, tested them, then checked them in. Then I
wanted to merge those changes back to branches/A. From my branches/A
directory I then executed
svn merge -r 972:973 http://svnhost/.../branches/B .
972 being the highest rev svn info displayed for branches/A and 973
being the highest rev displayed for branches/B. The merge command was
completely silent.
Doing an svn info on the individual files I see they have revision
numbers higher than 973. Do I have to wander around and figure out
the highest rev of all the changed files and use that instead of 973?
Why do I need revision numbers at all? Can't it just assume the tip
of the relevant branches?
Thanks,
Skip Montanaro
skip@pobox.com
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2390405
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
RE: Re: I don't understand the merge command at all...
Posted by Bob Archer <bo...@amsi.com>.
> -----Original Message-----
> From: Skip Montanaro [mailto:skip@pobox.com]
> Sent: Thursday, September 17, 2009 11:48 AM
> To: users@subversion.tigris.org
> Subject: RE: Re: I don't understand the merge command at all...
>
> Thanks. Working on building 1.6.5 now.
>
> Skip
Make sure you are updating the client and server. You have to upgrade the svn repository to the new version.
Also keep in mind... you can use the merge tracking with 1.6 right after you upgrade unless you have done no merges yet from that branch you should be ok.
If you have done merges previously you will have to tell svn about them. Although it sounds like you haven't done any merges yet.
BOb
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2396080
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
RE: Re: I don't understand the merge command at all...
Posted by Skip Montanaro <sk...@pobox.com>.
Thanks. Working on building 1.6.5 now.
Skip
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2396076
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: I don't understand the merge command at all...
Posted by Ryan Schmidt <su...@ryandesign.com>.
On Sep 17, 2009, at 09:52, Skip Montanaro wrote:
> Ack. I shouldn't attempt to disguise things. I am sitting in "A":
>
> % pwd
> /home/titan/skipm/src/rigel/branches/tlib
> % svn merge http://svnhost:3690/svn/rigel/branches/resting
> svn: Not enough arguments provided; try 'svn help' for more info
You need to be running Subversion 1.5.0 or greater...
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2396060
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
RE: I don't understand the merge command at all...
Posted by Skip Montanaro <sk...@pobox.com>.
Ack. I shouldn't attempt to disguise things. I am sitting in "A":
% pwd
/home/titan/skipm/src/rigel/branches/tlib
% svn merge http://svnhost:3690/svn/rigel/branches/resting
svn: Not enough arguments provided; try 'svn help' for more info
S
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2396034
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: I don't understand the merge command at all...
Posted by Andy Levy <an...@gmail.com>.
On Thu, Sep 17, 2009 at 11:14, Skip Montanaro <sk...@pobox.com> wrote:
> I suppose I should point out that I'm using svn 1.4.3. Is that too long-in-the-tooth?
Definitely. The merge-tracking advice you were given previously only
applies to 1.5 and newer.
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2396070
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
RE: I don't understand the merge command at all...
Posted by Skip Montanaro <sk...@pobox.com>.
I suppose I should point out that I'm using svn 1.4.3. Is that too long-in-the-tooth?
Skip
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2396049
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
RE: I don't understand the merge command at all...
Posted by Bob Archer <bo...@amsi.com>.
> > > I made some changes to B, tested them, then checked them in. Then
> I
> > > wanted to merge those changes back to branches/A. From my
> branches/A
> > > directory I then executed
> > >
> > > svn merge -r 972:973 http://svnhost/.../branches/B .
> >
> > You should have executed:
> >
> > svn merge http://svnhost/.../branches/B
>
> Sorry to be so dense, but that's not working for me either. I am in
> branches/A and want to merge from branches/B. From my shell window:
>
> % pwd
> /home/.../branches/B
> % svn merge http://svnhost:3690/.../branches/B
> svn: Not enough arguments provided; try 'svn help' for more info
>
> Isn't there some easy way to tell svn to merge from the tip of branch
> B to the current directory?
Your pwd shoud be /home/.../branches/A when you run the merge command since that is your merge target folder.
BOb
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2396031
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
RE: I don't understand the merge command at all...
Posted by Skip Montanaro <sk...@pobox.com>.
> > I made some changes to B, tested them, then checked them in. Then I
> > wanted to merge those changes back to branches/A. From my branches/A
> > directory I then executed
> >
> > svn merge -r 972:973 http://svnhost/.../branches/B .
>
> You should have executed:
>
> svn merge http://svnhost/.../branches/B
Sorry to be so dense, but that's not working for me either. I am in
branches/A and want to merge from branches/B. From my shell window:
% pwd
/home/.../branches/B
% svn merge http://svnhost:3690/.../branches/B
svn: Not enough arguments provided; try 'svn help' for more info
Isn't there some easy way to tell svn to merge from the tip of branch
B to the current directory?
Thx,
Skip Montanaro
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2396025
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
RE: I don't understand the merge command at all...
Posted by Bob Archer <bo...@amsi.com>.
> svn merge seems to defeat my minimal understanding of how Subversion
> works. Case in point. I have a branch, call it branches/A. This
> morning I branched from it:
>
> svn copy branches/A branches/B
>
> I made some changes to B, tested them, then checked them in. Then I
> wanted to merge those changes back to branches/A. From my branches/A
> directory I then executed
>
> svn merge -r 972:973 http://svnhost/.../branches/B .
You should have executed:
svn merge http://svnhost/.../branches/B
> 972 being the highest rev svn info displayed for branches/A and 973
> being the highest rev displayed for branches/B. The merge command was
> completely silent.
You told it to do a diff of rev 972 and 973 on branch/B and merge that into your working copy. I am guessing that there were no changes in branch/B between those revs... which is why it did nothing. That said, this is NOT what you wanted. As you said, you wanted to merge the changes you made in B since you branched it from A... which the command I gave you above will do.
> Doing an svn info on the individual files I see they have revision
> numbers higher than 973. Do I have to wander around and figure out
> the highest rev of all the changed files and use that instead of 973?
> Why do I need revision numbers at all? Can't it just assume the tip
> of the relevant branches?
No, that is what merge tracking does for you. It figures out what the base rev is based on when you created the branch. Then it determines if you have merged anything from the source of the merge into the target already. Once it figures that out then it does a diff and applies it to your WC.
BOb
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2390408
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].