subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Anton Shepelev <anton....@gmail.com>
Subject Re: Problem with merge --reintegrate
Date Sat, 23 Dec 2017 15:29:34 GMT
I wrote:

> I  am  having  trouble  reintegrating my fresh and
> short-lived test  branch  (called  progbar).   Al-
> though  there  have  been  no changes to the trunk
> since the creation of  the  branch  from  revision
> 2324,
>
>    svn merge "^/branches/progbar" --reintegrate
>
> gives:
>
>    svn: E195012: Unable to find repository location for
>    '<hidden'>svn/Sources/trunk' in revision 1823
>
> trunk  indeed was not created until revision 2252,
> but I wonder why can SVN be interested in revision
> 1823, if I created my test branch by copying revi-
> sion 2524 of the trunk:
> [...]

This problem is somehow conntected with  sparse  di-
rectories.  If I update the working copy of trunk so
that it has the file affected in 1823, reintegration
completes successfully, but that file is not modifed
and is not shown by  'svn  diff'  after  'svn  merge
--reintegrate'.

Now  can  bypass  the  problem, but I should like to
know why it occurs in the first place, so I have re-
verted the merge and can reproduce it again.  I will
appreciate your help in tracking-down its cause.

-- 
Please, do not forward replies to my e-mail.


Mime
View raw message