[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Branches screwed up!

From: Lübbe Onken <luebbe.tortoisesvn_at_googlemail.com>
Date: Wed, 21 Dec 2011 08:41:32 +0100

Hi Alan,

2011/12/20 Alan Balkany <Alan.Balkany_at_efi.com>

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

Check your branch working copy. Is it still pointing to the trunk URL of
the repository? You probably forgot to switch your WC after creating the
branch.

> ****
>
> **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?
>
whatever restore trunk means. Your repository? your working copy?

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

Switch your working copy. It doesn't happen automatically. Depending on
where you created the branch, TortoiseSVN might even asked you whether you
wanted to switch your WC to the newly created branch.

Other than that: <
http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-branchtag.html>
might help you.

Cheers
- Lübbe

--
Please help me get more space on Dropbox :)
https://www.dropbox.com/referrals/NTIwMzcxNjI5
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net  PGP Key ID 0x23F511AB
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2897016
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-12-21 08:41:42 CET

This is an archived mail posted to the TortoiseSVN Users mailing list.