Re: problem with branch from WC

On 06.04.2010 21:38, opto wrote:
> I tried to create a branch from a working copy. My WC contains some Visual
> studio files, also some binaries.
>
> In the branching message of TSVN, it reported success for the text files
> (like cpp, *,h).
> It reported the other files (*.ncb, *.suo, *.bin) as conflicted.

*.ncb, *suo files must not be put under version control at all. Those
are files that get re-created automatically if they're missing, and they
also contain user-specific data (and sometimes data that you definitely
don't want other people to see).
And of course since those files are binary and change by simply opening
VS, you will always get a conflict with those. And I mean *always*.

> Also, it seemed to copy the text files from trunk, although I clicked from
> working copy (if that is true, it would explain the conflict because just
> these files were different from trunk).

What do you mean with "it seemed"? Did it copy them from trunk or not?
Guessing won't help to solve any issue you have, we have to know what
happened before we can try and solve things.

> Does the check box from working copy actually work?

<sarcasm>
no, that check box is there for decoration only
</sarcasm>

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2503648
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].