[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: Stefan Sperling <stsp_at_apache.org>
Date: Sat, 23 Dec 2017 17:39:12 +0100

On Sat, Dec 23, 2017 at 06:29:34PM +0300, Anton Shepelev wrote:
> 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.
>

Which version of svn are you using to run this merge?
Received on 2017-12-23 17:39:47 CET

This is an archived mail posted to the Subversion Users mailing list.