Win a copy of Microservices Testing (Live Project) this week in the Spring forum!
  • Post Reply Bookmark Topic Watch Topic
  • New Topic
programming forums Java Mobile Certification Databases Caching Books Engineering Micro Controllers OS Languages Paradigms IDEs Build Tools Frameworks Application Servers Open Source This Site Careers Other Pie Elite all forums
this forum made possible by our volunteer staff, including ...
Marshals:
  • Campbell Ritchie
  • Tim Cooke
  • Ron McLeod
  • Jeanne Boyarsky
  • Paul Clapham
Sheriffs:
  • Liutauras Vilda
  • Henry Wong
  • Devaka Cooray
Saloon Keepers:
  • Tim Moores
  • Stephan van Hulst
  • Tim Holloway
  • Al Hobbs
  • Carey Brown
Bartenders:
  • Piet Souris
  • Mikalai Zaikin
  • Himai Minh

SVN: release branching, merging into trunk

 
Ranch Hand
Posts: 884
  • Mark post as helpful
  • send pies
    Number of slices to send:
    Optional 'thank-you' note:
  • Quote
  • Report post to moderator
Hi all,

Say I'm doing my development work on the trunk, then i branch off to do a release, and then continue with my development on the trunk. As bugs come, I get it fix on the release branch, then merge it back to the trunk.

Is this approach what people would normally do? Is there any Subversion graphical client that would help to do this?

 
author & internet detective
Posts: 41184
848
Eclipse IDE VI Editor Java
  • Mark post as helpful
  • send pies
    Number of slices to send:
    Optional 'thank-you' note:
  • Quote
  • Report post to moderator
Chengwei,
Yes. That is a common approach to handling branches. We use that approach too.

Are you looking for a standalone client or one that integrates into an IDE? If an IDE, which one?
 
Chengwei Lee
Ranch Hand
Posts: 884
  • Mark post as helpful
  • send pies
    Number of slices to send:
    Optional 'thank-you' note:
  • Quote
  • Report post to moderator
Hi Jeanne,

I actually have both Subclipse & TortoiseSVN, but I'm missing the link on how to do the merging of bug fixes from release branches into my trunk. Any help on that?

 
Ranch Hand
Posts: 243
  • Mark post as helpful
  • send pies
    Number of slices to send:
    Optional 'thank-you' note:
  • Quote
  • Report post to moderator

Originally posted by Chengwei Lee:
Hi Jeanne,

I actually have both Subclipse & TortoiseSVN, but I'm missing the link on how to do the merging of bug fixes from release branches into my trunk. Any help on that?



we normally use command line tool to do the merging.
If you have taken the release branch at rev: 100 from trunk and if your
current revision is 200, then the command would be as follows:

svn merge -r100:200 http://yourrepo/releasebranch .

. refers to the current checkout folder of trunk folder.

Tortoise also has the option of merge context menu.
Did you try that?

Regards
Vijay
 
Chengwei Lee
Ranch Hand
Posts: 884
  • Mark post as helpful
  • send pies
    Number of slices to send:
    Optional 'thank-you' note:
  • Quote
  • Report post to moderator
Am trying out with TortoiseSVN now for the branching & merging. Thanks.
 
Ranch Hand
Posts: 472
  • Mark post as helpful
  • send pies
    Number of slices to send:
    Optional 'thank-you' note:
  • Quote
  • Report post to moderator
Chengwei , do you mind to further explain how is it to be done ? i facing the problem as what you facing as well
 
Chengwei Lee
Ranch Hand
Posts: 884
  • Mark post as helpful
  • send pies
    Number of slices to send:
    Optional 'thank-you' note:
  • Quote
  • Report post to moderator
Nakata, I'm using TortoiseSVN so I'm refering to their help file for it, mainly on these 2 links: branching/tagging and merging. Still experimenting, hope it works well for you.
 
Nakata kokuyo
Ranch Hand
Posts: 472
  • Mark post as helpful
  • send pies
    Number of slices to send:
    Optional 'thank-you' note:
  • Quote
  • Report post to moderator
thanks chengwei for the information
 
With a little knowledge, a cast iron skillet is non-stick and lasts a lifetime.
reply
    Bookmark Topic Watch Topic
  • New Topic