You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Stefan Sperling <st...@elego.de> on 2008/03/23 23:16:50 UTC
Do trivial conflicts in backports require temporary branches?
I'd like to nominate r30004 for backport to 1.4.x.
See here for a 1.4.x user being bitten by the issue:
http://subversion.tigris.org/servlets/ReadMsg?list=users&msgNo=76142
In case we ever have another 1.4.x release, it would be
bad if it did not fix this bug.
According to both Erik Hülsmann and the Hacker's guide,
a backport that causes a conflict needs a temporary branch.
Merging r30004 (which changes a single file) into 1.4.x does cause
one conflict, but it is really, really, trivial (whitespace changes).
Should I create a temporary branch nonetheless?
#ifdef MAX_SECS_TO_LINGER
/* ### old APR interface */
status = apr_socket_create(sock, sa->family, SOCK_STREAM, pool);
#else
<<<<<<< .working
status = apr_socket_create(sock, sa->family, SOCK_STREAM, APR_PROTO_TCP,
pool);
=======
status = apr_socket_create(sock, sa->family, SOCK_STREAM, APR_PROTO_TCP,
pool);
>>>>>>> .merge-right.r30004
#endif
if (status == APR_SUCCESS)
{
P.S. I've already nominated r30004 for backport to 1.5.x, without
testing the merge beforehand (sorry, will never happen again).
Turns out it doesn't cause a conflict while merging into 1.5.x :)
--
Stefan Sperling <st...@elego.de> Software Developer
elego Software Solutions GmbH HRB 77719
Gustav-Meyer-Allee 25, Gebaeude 12 Tel: +49 30 23 45 86 96
13355 Berlin Fax: +49 30 23 45 86 95
http://www.elego.de Geschaeftsfuehrer: Olaf Wagner
Re: Do trivial conflicts in backports require temporary branches?
Posted by Stefan Sperling <st...@elego.de>.
On Mon, Mar 24, 2008 at 12:16:50AM +0100, Stefan Sperling wrote:
>
> I'd like to nominate r30004 for backport to 1.4.x.
>
> See here for a 1.4.x user being bitten by the issue:
> http://subversion.tigris.org/servlets/ReadMsg?list=users&msgNo=76142
Turns out the user didn't hit this particular issue after all.
I was a bit too sloppy reading his problem report.
But I guess we still want the fix in 1.4.7 nonetheless, if
that will ever be released.
--
Stefan Sperling <st...@elego.de> Software Developer
elego Software Solutions GmbH HRB 77719
Gustav-Meyer-Allee 25, Gebaeude 12 Tel: +49 30 23 45 86 96
13355 Berlin Fax: +49 30 23 45 86 95
http://www.elego.de Geschaeftsfuehrer: Olaf Wagner