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

Re: Merging or moving from "trunk" to a branch.

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-02-22 22:12:13 CET

On Feb 22, 2005, at 2:58 PM, Stephen McConnell wrote:
>
> Developers are committing changes to trunk, but an immediate bug fix
> needs to be moved from trunk to the release branch.

Yes, this is a common scenario. We do this all the time.

> I need to move that specific file with the specific revision number to
> the release
> branch

Incorrect. You need to "port" the bugfix changes to the branch.

I certainly don't mean to offend, but have you RTFM'd chapter 4, the
whole chapter on merging? It discusses this scenario in detail.

TortoiseSVN is a nice GUI, but clicking on a "merge" menu item isn't
going to help if you don't understand Subversion merging concepts.
It's not just about copying files from one place to another. That may
work in CVS, but things are different in SVN.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Feb 22 22:14:30 2005

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