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

Re: simple svn merge question

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-06-16 19:38:36 CEST

On Jun 16, 2005, at 12:33 PM, dkrobbins@micron.com wrote:
>
> If I want to get the branch changes into trunk I need to:
> - have a trunk working copy
> - svn merge trunk_repo branch_repo

Incorrect. To merge branch changes to trunk, you need to tell 'svn
merge' to compare two snapshots of the branch, and then apply the
differences to a trunk working copy.

Take a look at this relatively new section of chapter 4:

   http://svnbook.red-bean.com/en/1.1/ch04s03.html#svn-ch-4-sect-3.2

In particular, you've fallen into the classic confusion described here:

   http://svnbook.red-bean.com/en/1.1/ch04s04.html#svn-ch-4-sect-4.1

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jun 16 19:41:24 2005

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