Re: Branches screwed up!

On Tue, Dec 20, 2011 at 14:42, Alan Balkany <Alan.Balkany_at_efi.com> wrote:
>
> 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)

Do you have separate working copies for your branch vs. your trunk, or
are you switching one WC between the 2 URLs?

> 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?

Have you updated your trunk WC?

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

Did you check out a WC from that branch, or switch a trunk WC to the branch URL?

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-12-20 20:50:28 CET