You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Daniel Shahaf <da...@elego.de> on 2012/10/04 00:12:22 UTC
svn-role reintegrates Re: svn commit: r1392727 - in
/subversion/branches/1.7.x: ./ STATUS
subversion/libsvn_ra/ra_loader.h
subversion/libsvn_ra_serf/options.c
subversion/libsvn_ra_serf/serf.c subversion/libsvn_ra_serf/util.c
svn-role@apache.org wrote on Tue, Oct 02, 2012 at 04:02:25 -0000:
> Author: svn-role
> Date: Tue Oct 2 04:02:24 2012
> New Revision: 1392727
>
> URL: http://svn.apache.org/viewvc?rev=1392727&view=rev
> Log:
> Reintegrate the 1.7.x-serf-server-root-segfaults branch:
Shall we make svn-role run 'svn merge' using trunk? (as --reintegrate
is deprecated)
Another option is to use 1.8.0-alpha1 once we cut that
Julian is +1 (to using trunk) on IRC.
RE: svn-role reintegrates Re: svn commit: r1392727 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/options.c subversion/libsvn_ra_serf/serf.c subversion/libsvn_ra_serf/util.c
Posted by Bert Huijben <be...@qqmail.nl>.
> -----Original Message-----
> From: Daniel Shahaf [mailto:danielsh@elego.de]
> Sent: donderdag 4 oktober 2012 00:12
> To: dev@subversion.apache.org
> Cc: commits@subversion.apache.org
> Subject: svn-role reintegrates Re: svn commit: r1392727 - in
> /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_ra/ra_loader.h
> subversion/libsvn_ra_serf/options.c subversion/libsvn_ra_serf/serf.c
> subversion/libsvn_ra_serf/util.c
>
> svn-role@apache.org wrote on Tue, Oct 02, 2012 at 04:02:25 -0000:
> > Author: svn-role
> > Date: Tue Oct 2 04:02:24 2012
> > New Revision: 1392727
> >
> > URL: http://svn.apache.org/viewvc?rev=1392727&view=rev
> > Log:
> > Reintegrate the 1.7.x-serf-server-root-segfaults branch:
>
> Shall we make svn-role run 'svn merge' using trunk? (as --reintegrate
> is deprecated)
>
> Another option is to use 1.8.0-alpha1 once we cut that
>
> Julian is +1 (to using trunk) on IRC.
I don't think we actively review the result of these automatic merges. This
makes me slightly uncertain if we should really use trunk.
Personally, I certainly don't review revisions as if they were merged with
trunk. (I always use latest stable or alphas for my own working copies)
I don't see a problem using alphas for the branch management.
Bert
RE: svn-role reintegrates Re: svn commit: r1392727 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/options.c subversion/libsvn_ra_serf/serf.c subversion/libsvn_ra_serf/util.c
Posted by Bert Huijben <be...@qqmail.nl>.
> -----Original Message-----
> From: Daniel Shahaf [mailto:danielsh@elego.de]
> Sent: donderdag 4 oktober 2012 00:12
> To: dev@subversion.apache.org
> Cc: commits@subversion.apache.org
> Subject: svn-role reintegrates Re: svn commit: r1392727 - in
> /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_ra/ra_loader.h
> subversion/libsvn_ra_serf/options.c subversion/libsvn_ra_serf/serf.c
> subversion/libsvn_ra_serf/util.c
>
> svn-role@apache.org wrote on Tue, Oct 02, 2012 at 04:02:25 -0000:
> > Author: svn-role
> > Date: Tue Oct 2 04:02:24 2012
> > New Revision: 1392727
> >
> > URL: http://svn.apache.org/viewvc?rev=1392727&view=rev
> > Log:
> > Reintegrate the 1.7.x-serf-server-root-segfaults branch:
>
> Shall we make svn-role run 'svn merge' using trunk? (as --reintegrate
> is deprecated)
>
> Another option is to use 1.8.0-alpha1 once we cut that
>
> Julian is +1 (to using trunk) on IRC.
I don't think we actively review the result of these automatic merges. This
makes me slightly uncertain if we should really use trunk.
Personally, I certainly don't review revisions as if they were merged with
trunk. (I always use latest stable or alphas for my own working copies)
I don't see a problem using alphas for the branch management.
Bert