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

RE: merge --reintegrate crash

From: David Aldrich <David.Aldrich_at_EMEA.NEC.COM>
Date: Tue, 19 Jul 2011 13:11:32 +0000

> -----Original Message-----
> From: Stefan Sperling [mailto:stsp_at_elego.de]
> Sent: 19 July 2011 13:31
> To: David Aldrich
> Cc: users_at_subversion.apache.org
> Subject: Re: merge --reintegrate crash
>
> On Tue, Jul 19, 2011 at 12:18:05PM +0000, David Aldrich wrote:
> > > Thanks for your reply. Yes, we do have path-based authz rules, but
> my
> > > account should have no restrictions on the repository in question.
> I
> > > will check...
> >
> > I have checked. I have full access to the branch and trunk.
>
> Good! I am just trying to gather data points in order to locate the
> change that introduced the regression. There was a change in 1.6.13
> to fix a problem with reintegrate and authz (I haven't yet dug into
> details though).
>
> With a 1.6.12 client, do you get the same behaviour as Thomas
> described here? http://svn.haxx.se/users/archive-2011-01/0260.shtml
>
> Thanks!

1.6.12 does not crash and gives a useful error message:

C:\>svn merge --reintegrate ^^/branches/<my_branch_name>
svn: Reintegrate can only be used if revisions 3059 through 3660 were previously merged from <url>/trunk to the reintegrate source, but this is not the case:
  branches/<my_branch_name>/<my_filename.cpp>
    Missing ranges: /branches/<my_branch_name>/<my_filename.cpp>:3069
  branches/<my_branch_name>/<my_filename.h>
    Missing ranges: /branches/<my_branch_name>/<my_filename.h>:3069
Received on 2011-07-19 15:12:30 CEST

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