Re: Moving branch changes back to trunk

On Aug 30, 2005, at 7:12 PM, Andrew Boothman wrote:
>
> Or am I just making everything too complex and I should just do the
> merge?

You're thinking too hard. :-)

If the trunk is exactly identical to the "beginning" state of the
branch, then just compare HEAD of trunk with the HEAD of branch:

   $ svn checkout trunkURL project
   $ cd project
   $ svn merge trunkURL branchURL .
   $ svn commit -m "Merged branch changes to trunk."

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Aug 31 04:46:22 2005