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 14:36:17 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:
> [...]

'svn diff' between branch and trunk shows  only  the
two  files  that  I modified in the branch, of which
neither was touched in revision 1823.

Sorry for three messages instead of one.

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


Mime
View raw message