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

Re: Directory Already Added Bug?

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Sat, 04 Feb 2012 18:28:51 +0100

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


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-02-04 18:29:06 CET

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.