You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Jorge Medina <jm...@e-dialog.com> on 2008/05/20 18:30:54 UTC
Merging from trunk into a branch
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.
Thanks
-Jorge
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
RE: Merging from trunk into a branch
Posted by Jorge Medina <jm...@e-dialog.com>.
Thank you Blair, svnmerge.py is exactly what I was looking for. The tool
really simplifies merging when working with branches.
I'm looking forward to Subversion 1.5
-----Original Message-----
From: Blair Zajac [mailto:blair@orcaware.com]
Sent: Tuesday, May 20, 2008 4:25 PM
To: Jorge Medina
Cc: users@subversion.tigris.org
Subject: Re: Merging from trunk into a branch
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:
http://www.orcaware.com/svn/wiki/Svnmerge.py
Regards,
Blair
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Merging from trunk into a branch
Posted by Blair Zajac <bl...@orcaware.com>.
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:
http://www.orcaware.com/svn/wiki/Svnmerge.py
Regards,
Blair
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org