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

Re: newbie question

From: Duncan Murdoch <murdoch_at_stats.uwo.ca>
Date: 2006-03-21 16:40:13 CET

On 3/21/2006 9:51 AM, Craig White wrote:
> On Tue, 2006-03-21 at 02:08 -0700, Bob Proulx wrote:
>> Craig White wrote:
>> > I want to merge my 'branch' back into the 'trunk'.
>> >
>> > Do I merge the 'branch' version with the 'tag' version into the
>> > 'trunk' ?
>> >
>> > I am somewhat confused on this. Also I am planning on doing this on my
>> > workstation and then 'committing' the changes on the trunk back to the
>> > repository...is that how it's all done?
>>
>> Yes. You pretty much have it. But please read this part of the book
>> which covers your question in detail.
>>
>> http://svnbook.red-bean.com/en/1.1/ch04.html
>>
> ----
> I've been through that book and that is why I'm so confused. All I
> wanted to do was to merge my branch into the trunk - the tag version was
> for my safety.
>
> I can't seem to merge into the existing trunk.

The tag isn't involved in the merge. What you need to do is this:

Make sure all your changes to the branch have been committed.

Identify which changes on the branch you want to merge. (Typically that
would be all of them, but not necessarily.) You can use svn log
--stop-on-copy, and you'll see everything since the branch was created.
  Say you started making changes at rev 123, and you want all the
changes from there to rev 456. (Rev 123 would be the revision just
before your first change, 456 after your last one.)

Check out the trunk (or switch to it).

At the root of the trunk working copy, do

svn merge -r123:456 url:path/to/branch/root

This will merge all the changes you made to the branch into the trunk.
You should now look at all the changes and be sure they work (try
compiling, testing, etc.), then commit with a log message saying that
you've just merged changes 123:456 from the branch to the trunk.

That's it!

Duncan Murdoch

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Mar 21 16:47:02 2006

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