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

Directory Already Added Bug?

From: Jon Hardcastle <Jon_at_ehardcastle.com>
Date: Mon, 30 Jan 2012 16:08:02 +0000

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?

-- 
----------
N: Jon Hardcastle
E: Jon_at_eHardcastle.com
Q: The avalanche has already started. It is too late for the pebbles to
vote.
Received on 2012-01-30 17:08:56 CET

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

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