Re: Directory Already Added Bug?

On 03.02.2012 13:28, Jon Hardcastle wrote:
> Bump!
>
> On 30 January 2012 15:55, Jon Hardcastle<Jon_at_ehardcastle.com> wrote:
>> Hi,
>>
>> I have an issue where by i am trying to merge a directory structure from a
>> into b.
>>
>> One of the changes in that structure is that a directory that is already
>> present in b has been deleted and re-added in a.
>>
>> Hence I am trying to merge in the re-add. The only flagging of this I see is
>> a tree conflict telling it was already added and the ONLY option is 'Keep
>> the local directory' which is unlikely to be the desired actions since one
>> went to the trouble of merging a into b perhaps one might want the 'already
>> added' contents from a? instead of the statusquo of b?
>>
>> Is this correct?

The option you see to resolve the conflict "keep local directory" is the
only option that TSVN can do automatically for you.
If you want to resolve that conflict in another way, you have to do that
manually.

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=2918133
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].