[Svnmerge] merge two branches

[Kamal Ahmed]

Hi Simon,


Here is what i did

mkdir MERGE
cd MERGE
svn co https://svn.hq.cod.corp/co/perlapp/branches/RC-MOVEAPRIL13-1
cd RC-MOVEAPRIL13-1
svnmerge.py init 


cd ..
svnmerge merge https://svn.hq.co.corp/co/perlapp/branches/build_7.3
Nothing happened

then:
cd MERGE/RC-MOVEAPRIL13-1
svn merge -S https://svn.hq.co.corp/co/perlapp/branches/build_7.3


Now,  how do i know if 7.3 was indeed merged ? it happened very fast, so i think nothing happened

Thanks,
-Kamal.



Lucy <simon.lucy at objective2k.com>

To: Kamal Ahmed <kamal2222ahmed at yahoo.com> 
>Cc: "svnmerge at orcaware.com" <svnmerge at orcaware.com> 
>Sent: Saturday, July 6, 2013 1:14 PM
>Subject: Re: [Svnmerge] merge two branches
> 
>
>
>
>
>Kamal Ahmed wrote: 
>Hi,
>>
>>
>>Is it possible to merge :
>>
>>
>>from: https://svn.hq.co.corp/co/perlapp/branches/build_7.3
>>
>>to: https://svn.hq.cod.corp/co/perlapp/branches/RC-MOVEAPRIL13-1
>>
>>
>>using svnmerge.py. I could only find 
info on merging to trunk
>>
You can merge between any two branches that have been 'initied' when you init svnmerge you do so in the top level directory of the branch you 
want to merge to.  So if you have two branches one the descendent of the other and you want to merge forward from the parent branch you would 
init the descendent branch.  If you want to merge changes back to the 
parent then you would svnmerge init in the parent working copy.
>
>S
> 
>
>
>>
>>Thanks,
>>-Kamal.
>>
>>_______________________________________________
Svnmerge mailing list Svnmerge at orcaware.com http://www.orcaware.com/mailman/listinfo/svnmerge 
>_______________________________________________
>Svnmerge mailing list
>Svnmerge at orcaware.com
>http://www.orcaware.com/mailman/listinfo/svnmerge
>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/svnmerge/attachments/20130706/e42b1c39/attachment.html>