Excellent, thanks.
Stanislav
2014-07-16 22:20 GMT+02:00 Stefan Küng <tortoisesvn_at_gmail.com>:
> On 16.07.2014 18:08, Stanislav Bek wrote:
> > Hi,
> > I would like to ask about thing which confuses me.
> >
> > Suppose you have two DIFFERENT files accidently with the same name (and
> > same place in tree) in repository (call it "frep") and in working copy
> > ("fwc").
> >
> > Now if you update your wc, the fwc will get versioned (without error nor
> > warning) and at the same time the fwc is marked as modified. If you
> > commit wc, the fwc will replace (again without warning) frep in
> repository.
> >
> > Why there is no conflict rised by update? It happend to me that some old
> > unversioned files in wc became head version in repository even without
> > warning.
>
> Settings dialog->Advanced->AllowUnversionedObstruction
> set the value to false
>
> From the docs:
> AllowUnversionedObstruction
> If an update adds a new file from the repository which already exists in
> the local working copy as an unversioned file, the default action is to
> keep the local file, showing it as a (possibly) modified version of the
> new file from the repository. If you would prefer TortoiseSVN to create
> a conflict in such situations, set this value to false.
>
>
> 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=3085269
>
> To unsubscribe from this discussion, e-mail: [
> users-unsubscribe_at_tortoisesvn.tigris.org].
>
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3085296
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-07-17 11:20:28 CEST