[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Merging from trunk into a branch

From: Blair Zajac <blair_at_orcaware.com>
Date: Tue, 20 May 2008 13:24:38 -0700

Jorge Medina wrote:
> Hi,
> I am using subversion (1.4) for the first time.
> I have read the subversion book and found that merging changes from a feature branch into the trunk must be done only from the last merge; basically applying the last set of changes.
> But I have doubts about the opposite operation: merging from the trunk into the feature branch.
> Lets assume that I keep a feature branch and from time to time I want to receive changes done to the trunk by other teams. The subversion book makes reference only on applying the difference from a revision of the trunk into the branch. In page 83 of the book:
> $ svn merge -c 344 http://svn.example.com/repos/calc/trunk
> U integer.c
> $ svn status
> M integer.c
> Is this the right way to merge changes from the trunk into the branch?
> The command is only applying the change of the specified revision (343:344), right?
> I want to apply all changes from the trunk into my branch -merging them into my branch, reviewing and commit into the branch-
> Should I also be keeping track of the last time I performed a merge operation?
> I have used previously the product Accurev, I am trying to define the set of svn commands that would be the equivalent of an accurev update -bring changes from the parent stream (the trunk) into my workspace- and the accurev promote command (merging changes from the child stream -the branch- into the parent stream -the trunk- ).
> Has anybody in this list have used both systems: accurev and subversion? I would like to hear from you. There is no question in my mind that Accurev is superior -sorry Subversion folks-; but I am not trying to convince anyone of that. (Subversion is free after all!) I just want to know how to apply the same concepts I already know (update and promote) into the Subversion world. I am a strong believer of using feature branches (or streams as called in accurev); but this requires a frequent use of merging from and to the trunk. I need to come up with a very specific set of procedures for our development team to perform the merges appropriately.

Until 1.5 comes out with built-in merge tracking support, use svnmerge.py to
handle merges between trunk and branches:



To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-05-20 22:25:02 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.