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

Trouble Merging Branch Into Trunk

From: Jacob <imlistening_at_myway.com>
Date: 2007-04-13 17:28:44 CEST

First, please reply directly to imlistening@myway.com -- Thank you.

I created a branch from a tagged revision in my trunk. So now I have:

/trunk/Project/

and

/branches/Project-Rev555

I modified the branch with a simple change, and want to merge that branch into the trunk.

Using Tortoise, I do:

From: /trunk/Project HEAD

To: /branches/Project-Rev555 HEAD

Doing so, it tries to update the branch, not the trunk. When I reverse the From/To, it reverts the trunk back to the branch.

What am I doing wrong? Please help. Email directly to my address is preferred.

Thank you

_______________________________________________
No banners. No pop-ups. No kidding.
Make My Way your home on the Web - http://www.myway.com

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Apr 13 22:25:10 2007

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