How to switch branches without merging

Hello all,

So, I'm wanting to start using the Branching feature of TortoiseSVN, so that
I can keep my production code separate from my code that is still a
work-in-progress. So far, so good, right?

However, the problems arise when I want to switch from one of my branches to
the main trunk.

Here's the hypothetical :

I'm working on a branch called MyCode_Version_1.3, which represents the next
version of my app. The main trunk is called MyCode_Main, which represents
code that is currently running on my production server. I'm doing some work
on MyCode_Version_1.3, when all of a sudden one of my coworkers finds a bug
in the Main Trunk. Bad news.

Okay, so obviously I want to switch to the main trunk, fix the bug, check in
my code, and then go back to working on MyCode_Version_1.3. However, I'm
not yet ready to merge MyCode_Version_1.3 into MyCode_Main. As far as I
know, the only way to prevent a merge is to check in MyCode_Version_1.3
before switching to MyCode_Main. This is a problem - the code that I'm
working on in MyCode_Version_1.3 is still a work in progress, and some of it
hasn't even been compiled yet. I'm not yet ready for my team members, who
are also working on MyCode_Version_1.3, to see my changes.

Is there a way that I can switch between MyCode_Version_1.3 and MyCode_Main
without doing a merge, and without having to check in MyCode_Version_1.3?

-- 
View this message in context: http://www.nabble.com/How-to-switch-branches-without-merging-tp20385173p20385173.html
Sent from the tortoisesvn - users mailing list archive at Nabble.com.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org