Branches screwed up!

Hello,

I created a branch (1.6) from the Trunk version of my project, and I've been adding to 1.6 while also fixing bugs in Trunk. I've just discovered that SVN IS PUTTING ALL THE 1.6 MODIFICATIONS INTO TRUNK! It's a mess!

I have a few questions:

1. Why did this happen? (There are separate Trunk and 1.6 folders in the repository)

2. I've restored Trunk to when the branch occurred, but I can't make any more modifications because SVN tells me it's "out of date". How can I restore Trunk?

3. How can I connect 1.6 on disk with 1.6 in the repository?

Thanks a lot!

Alan Balkany
Software Engineer
Jetrion Industrial Inkjet Systems
Electronics for Imaging, Inc.

1260 James L. Hart Parkway
Ypsilanti, MI 48197

[734] 736-4539 tel
alan.balkany_at_efi.com<mailto:jason.oliver_at_efi.com>

[cid:image001.jpg_at_01CCBF25.913B9CC0]

________________________________
Confidentiality notice: This message may contain confidential information. It is intended only for the person to whom it is addressed. If you are not that person, you should not use this message. We request that you notify us by replying to this message, and then delete all copies including any contained in your reply. Thank you.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2895175

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].