r31313 merge to 1.5.x has conflicts

["Hyrum K. Wright" <hy...@mail.utexas.edu>]

I ran into several conflicts while attempting to merge r31313 to 1.5.x this 
evening.  Could somebody with more knowledge of serf and/or this change create a 
backport branch or perform the actual merge?

Thanks,
-Hyrum

Re: r31313 merge to 1.5.x has conflicts

[sv...@mobsol.be]

Quoting Lieven Govaerts <sv...@mobsol.be>:

> Hyrum K. Wright wrote:
> > I ran into several conflicts while attempting to merge r31313 to 1.5.x
> > this evening.  Could somebody with more knowledge of serf and/or this
> > change create a backport branch or perform the actual merge?
> >
> Created branch 1.5.x-ra_serf-backports to test which revisions are
> needed to get all the tests passing over ra_serf. Depending on the
> results I'll nominate other revisions for backport.
>

According to BuildBot, the tests all passed over ra_serf on the
1.5.x-ra_serf-backports branch:
http://www.mobsol.be/buildbot/x86-macosx-gnu%20shared%20daily%20ra_serf/builds/428/step-Test%20fsfs%2Bra_serf/1

The required revisions are:
r31313 (already approved)
r31234 fixes API issue, solves merge conflict with r31313
r31550 fixes the 'check repo uuid on repo access' feature
r31630 fixes copy test 22
r31629 fixes blame test 16. Note this revision is a refactoring where two
functions are combined into one. It's needed because the resulting function was
improved later, so blame, where we still used the old function, was broken.

I'll nominate those 4 revisions in one group, so we just have to merge the
backport branch to 1.5.x.

Lieven

----------------------------------------------------------------
This message was sent using IMP, the Internet Messaging Program.


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: r31313 merge to 1.5.x has conflicts

[Lieven Govaerts <sv...@mobsol.be>]

Hyrum K. Wright wrote:
> I ran into several conflicts while attempting to merge r31313 to 1.5.x 
> this evening.  Could somebody with more knowledge of serf and/or this 
> change create a backport branch or perform the actual merge?
>
Created branch 1.5.x-ra_serf-backports to test which revisions are 
needed to get all the tests passing over ra_serf. Depending on the 
results I'll nominate other revisions for backport.

Lieven

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org