Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » Subversive » doing dev in branch and trunk and mergin in both
doing dev in branch and trunk and mergin in both [message #484981] Thu, 10 September 2009 06:18 Go to next message
Alexandre Jaquet is currently offline Alexandre Jaquet
Messages: 38
Registered: July 2009
Member
Hi,

I'm looking for the way how I can merge for example a branch 0.1 and a trunk

I want to fix some features in the branch and continue my dev in trunk
and then merge both

I see there is a team->merge tool that allow to put two url I think this
is what I need ? Do I need to set url 1 to the branch and url 2 to the
trunk ?

Is there any tutorial for that ?

Thanks in advance
Re: doing dev in branch and trunk and mergin in both [message #487560 is a reply to message #484981] Wed, 23 September 2009 15:05 Go to previous message
Igor Burilo is currently offline Igor Burilo
Messages: 435
Registered: July 2009
Senior Member
Hello Alexandre,

In your case you don't need to use '2 URLs' tab of Merge dialog. If you're
merging changes from trunk to branch you should switch to branch and in
merge dialog in 'URL' tab specify trunk url; if you need to merge from
branch to trunk you need to switch trunk, select 'Reintegrate' tab and
specify branch url.
> Is there any tutorial for that ?
http://svnbook.red-bean.com/nightly/en/svn.branchmerge.basic merging.html

> Hi,
>
> I'm looking for the way how I can merge for example a branch 0.1 and a
> trunk
>
> I want to fix some features in the branch and continue my dev in trunk and
> then merge both
>
> I see there is a team->merge tool that allow to put two url I think this
> is what I need ? Do I need to set url 1 to the branch and url 2 to the
> trunk ?
>
> Is there any tutorial for that ?
>
> Thanks in advance
Previous Topic:Eclipse Subversive Installation guide
Next Topic:Show tags in history
Goto Forum:
  


Current Time: Fri Sep 19 21:58:38 GMT 2014

Powered by FUDForum. Page generated in 0.01577 seconds
.:: Contact :: Home ::.

Powered by: FUDforum 3.0.2.
Copyright ©2001-2010 FUDforum Bulletin Board Software