On 21.10.2013 19:10, Z W wrote:
> Hi All
>
> We are using 1.6 SVN.
> We have been syncing trunk to branch A and they are both synced up and
> ready for merge.
> We are trying to svn merge branch A to our trunk.
> But the branch was not created right in that it has a missing directory.
>
> eg.
> branch A has src directory
> src
>
>
> Trunk has src and install directories
> src
> install
>
>
> [root_at_host Trunk]# svn merge --reintegrate --dry-run
> https://url.com/svn/feature/atlas
> svn: 'https://url.com/svn/feature/atlas@1234' must be ancestrally
> related to 'https://url.com/svn/trunk@1234'
>
>
> How do we overcome this as src folder has quite a few large projects
> code base ?
> Using ignore-ancestry would ignore mergeinfo metadata and we're want
> to avoid duplicate code (from the trunk when merging from Trunk to
> Branch A) from the branch back to the Trunk.
> Mergeinfo property is only available at Trunk top level directory.
> Other mergeinfo properties at subdir levels had been removed before
> the trunk to branch A syncing began.
>
> Please advice with steps on a workaround we need.
> Any help is appreciated.
This all depends on how the branch was "not created right". I expect
that it you did not copy ^/trunk to ^/feature/atlas, yes?
Did you instead copy ^/trunk/src to ^/feature/atlas/src? Because then
the branch is the the latter, not ^/feature/atlas, and you should be
merging just the src directory.
-- Brane
--
Branko Čibej | Director of Subversion
WANdisco // Non-Stop Data
e. brane_at_wandisco.com
Received on 2013-10-21 20:07:24 CEST