Do trivial conflicts in backports require temporary branches?
From: Stefan Sperling <stsp_at_elego.de>
Date: Mon, 24 Mar 2008 00:16:50 +0100
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:
In case we ever have another 1.4.x release, it would be
According to both Erik Hülsmann and the Hacker's guide,
Merging r30004 (which changes a single file) into 1.4.x does cause
Should I create a temporary branch nonetheless?
#ifdef MAX_SECS_TO_LINGER
P.S. I've already nominated r30004 for backport to 1.5.x, without
-- Stefan Sperling <stsp_at_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
|
This is an archived mail posted to the Subversion Dev mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.