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

Re: svn commit: r895677 - in /subversion/branches/1.6.x: ./ CHANGES STATUS subversion/libsvn_client/merge.c subversion/libsvn_subr/mergeinfo.c subversion/tests/libsvn_subr/mergeinfo-test.c

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Mon, 04 Jan 2010 17:34:38 +0000

Hyrum K. Wright wrote:
> On Jan 4, 2010, at 11:18 AM, Bert Huijben wrote:
> >> -----Original Message-----
> >> From: hwright_at_apache.org [mailto:hwright_at_apache.org]
> >> Propchange: subversion/branches/1.6.x/
> >> ------------------------------------------------------------------------------
> >> --- svn:mergeinfo (original)
> >> +++ svn:mergeinfo Mon Jan 4 16:16:23 2010
> >> @@ -17,6 +17,8 @@
> >> /subversion/branches/1.6.x-r38572:875006-875011
> >> /subversion/branches/1.6.x-r38799:875225-875262
> >> /subversion/branches/1.6.x-r38927:875347-875521
> >> +/subversion/branches/1.6.x-r39019:879132-895676
> >> +/subversion/branches/1.6.x-r39109:879131
> >
> > What happens here ^^^^
> >
> > I think you triggered an old bug here that should be resolved by a previous merge?
>
> Dunno. I was using the latest 1.6.x client to do this merge, so it shouldn't be a already-fixed bug.

If it's the "1.6.x-r39109" part that's worrying, that could be genuine
mergeinfo. A branch named "1.6.x-r39109" did exist for a while; its name
was a typo and so it was deleted and recreated.

- Julian
Received on 2010-01-04 18:35:19 CET

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