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
_______________________________________________
---------------------------------------------------------------------
|
This is an archived mail posted to the Subversion Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.