On Sun, Nov 19, 2006 at 03:06:21PM +0100, Simone Rota wrote:
On Sun, 19 Nov 2006 14:27:25 +0100 Juergen Daubert <jue@jue.li> wrote:
Hi all,
Hey,
as you might have already seen, I've commited some updates for core-ports to our 2.3 branch.
Good. Meanwhile I tested a bit branch merging (one of the reasons we moved to git); so far so good.
To ease up maintainance of the branches I suggest we commit to 2.2 generic port updates, touching 2.3 only for specific, 2.3-related changes. This way we can periodically merge 2.2 updates with 2.3 with virtually no conflicts.
Yep, fine idea. I thought the same as I saw your first merge yesterday. All my commits till now are of that kind, meaning I wouldn't see them as candidates for 2.2, because they are incompatible like db and expat or need further testing like bash, automake or gettext. regards Juergen -- Juergen Daubert | mailto:jue@jue.li Korb, Germany | http://jue.li/crux