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

Re: problem with branch from WC

From: opto <kbuecher_at_optosolar.com>
Date: Tue, 6 Apr 2010 14:09:02 -0700 (PDT)

Sorry for being unclear.

1) I definitely checked the WC box for creating the new branch.
My understanding is that this commits the WC files to the new branch, not
the trunk (Head).
The path of the files added contained .../trunk...
That definitely feels wrong, they should contain the path of the WC,
shouldn't they?

2)VS studio binaries.
Yes, I know. Was careless when committing to trunk.
Nevertheless, IF they are included and IF I do not start VS, why should
there be a conflict?
The conflict message is part of the branch creation, and if there is no VS
active during that process, the files can't change, so how can there be a
conflict?

3)Does this work ... I read in the German forum that some other features are
present but don't work (communication with bug tracking software), so no
offense was intended.
Also, my TSVN can't switch to a new repository (see another open thread by
opto), so ... that is the reason for that question

anyway, thanks for your quick answer,

Klaus

Stefan Küng wrote:
>
> 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].
>
>

-- 
View this message in context: http://old.nabble.com/problem-with-branch-from-WC-tp28156449p28157550.html
Sent from the tortoisesvn - users mailing list archive at Nabble.com.
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2504473
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-04-06 23:09:00 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.