Tortoise SVN

Problem:

Often it is required to merge code changes between different code bases, and unknowingly on most occasions it is observed that wrong code commits happen. Heres one thing that I have observed while using Tortoise SVN for code merge and commits.Scenario:I have two versions

1) Trunk Version and 2) Production VersionTrunk Version is the one which will keep changing incrementally as new functionality is added iteratively.Production Version is the one which is release to LIVE or Deployed for customer/client use - No changes are incorporated in this version - Considered to be untouched and stable.
Most firms do this to baseline the code or in case of any functional failure rollback to previous build as emergency case.
Comming back to merging code:

1)Need to merge some code that was implemented in Trunk Version and that needs to be copied in Production Version.

2)Copy the folder that contain changes to the same folder loaction in Production.

3)While doing so, the .svn (Hidden folders are also copied - which contain the details of files and checkin/checkout details and location) are also over written

4)Merge the code by comparing5)When you start checking in the changes, you may think that you are checking in at Production Version but its actually cheking in at the Trunk Version instead, since the .svn files have been over written.
Solution:

Best way to merge is compare files, though its time consuming, but its accurate.