You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Jon Hardcastle <Jo...@ehardcastle.com> on 2012/01/30 17:08:02 UTC

Directory Already Added Bug?

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@eHardcastle.com
Q: The avalanche has already started. It is too late for the pebbles to
vote.

Re: Directory Already Added Bug?

Posted by Jon Hardcastle <Jo...@eHardcastle.com>.
Bump!

On 30 January 2012 16:08, Jon Hardcastle <Jo...@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?
>
> --
> ----------
> N: Jon Hardcastle
> E: Jon@eHardcastle.com
> Q: The avalanche has already started. It is too late for the pebbles to
> vote.



-- 
----------
N: Jon Hardcastle
E: Jon@eHardcastle.com
Q: The avalanche has already started. It is too late for the pebbles to vote.