Merge command - nothing happens

[Dave Levitt <da...@gmail.com>]

I have two branches in a repository. They have differences as reported
by svn diff, but svn merge --dry-run shows nothing [and without the
--dry-run switch does nothing]


The equivalent merge action in TortiseSVN also does nothing.

[like the command line svn,  toritise shows differences but shows
nothing happening when the merge action is taken].


The client is the current Win32 build:
svn, version 1.4.3 (r23084)
   compiled Jan 18 2007, 07:47:40


What should I be looking at next?

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: Merge command - nothing happens

[Ryan Schmidt <su...@ryandesign.com>]

On Feb 23, 2007, at 14:49, Dave Levitt wrote:

> On 2/23/07, Ryan Schmidt wrote:
>
>> On Feb 23, 2007, at 13:23, Dave Levitt wrote:
>>
>> > I have two branches in a repository. They have differences as  
>> reported
>> > by svn diff, but svn merge --dry-run shows nothing [and without the
>> > --dry-run switch does nothing]
>> >
>> >
>> > The equivalent merge action in TortiseSVN also does nothing.
>> >
>> > [like the command line svn,  toritise shows differences but shows
>> > nothing happening when the merge action is taken].
>> >
>> >
>> > The client is the current Win32 build:
>> > svn, version 1.4.3 (r23084)
>> >   compiled Jan 18 2007, 07:47:40
>> >
>> >
>> > What should I be looking at next?
>>
>> Tell us the exact merge command you're trying to execute. Usually in
>> cases like these, you're just issuing the wrong command. Show us what
>> you're doing, and maybe we can show you what you should be doing
>> instead.
>
> I think that this was a case of 'problem between keyboard and chair'
>
> I was trying something like
> svn merge url/to/trunk url/to/branch .
>
> And expecting the diff to be generated between the head of the trunk
> and the branch, with the differences written to the working copy at
> '.' [Intuitive assumption]
>
> This is not what is actually needed
> svn merge old/trunk/url/before/interesting/revision url/to/trunk .
>
> And have the differences between the two trunk revisions applied to
> the working copy at '.'
>
> It works 'sideways' from what I first expected it to do - but now I
> know what it is at least trying to do.

Yeah, usually you'll want to merge this way:

Consider that you have a branch foobranch that was create from let's  
say r100 of trunk. Then changes were made on trunk, and other changes  
were made on branch, and we're now at r200. And now you want to merge  
the changes made on the branch back into the trunk. Get a working  
copy of trunk, and merge in the changes that occurred between r100  
and r200 on the branch:

svn co $REPO/trunk
cd trunk
svn merge -r100:200 $REPO/branches/foobranch .
# test, test, test
svn ci -m "Merging r100-200 of foobranch into trunk"


On the other hand, if you have a branch foobranch and another branch  
barbranch that was created from foobranch, and now you want to merge  
the changes made on barbranch back into foobranch, then it works  
similarly.


-- 

To reply to the mailing list, please use your mailer's Reply To All  
function


---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: Merge command - nothing happens

[Ryan Schmidt <su...@ryandesign.com>]

On Feb 23, 2007, at 13:23, Dave Levitt wrote:

> I have two branches in a repository. They have differences as reported
> by svn diff, but svn merge --dry-run shows nothing [and without the
> --dry-run switch does nothing]
>
>
> The equivalent merge action in TortiseSVN also does nothing.
>
> [like the command line svn,  toritise shows differences but shows
> nothing happening when the merge action is taken].
>
>
> The client is the current Win32 build:
> svn, version 1.4.3 (r23084)
>   compiled Jan 18 2007, 07:47:40
>
>
> What should I be looking at next?

Tell us the exact merge command you're trying to execute. Usually in  
cases like these, you're just issuing the wrong command. Show us what  
you're doing, and maybe we can show you what you should be doing  
instead.


-- 

To reply to the mailing list, please use your mailer's Reply To All  
function


---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org