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

Re: Problem with merge --reintegrate

From: Anton Shepelev <anton.txt_at_gmail.com>
Date: Sat, 23 Dec 2017 17:36:17 +0300

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.
Received on 2017-12-23 15:36:17 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.