Return-Path: X-Original-To: apmail-gump-general-archive@www.apache.org Delivered-To: apmail-gump-general-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E863C1167B for ; Tue, 17 Jun 2014 04:12:26 +0000 (UTC) Received: (qmail 31272 invoked by uid 500); 17 Jun 2014 04:12:26 -0000 Delivered-To: apmail-gump-general-archive@gump.apache.org Received: (qmail 31226 invoked by uid 500); 17 Jun 2014 04:12:26 -0000 Mailing-List: contact general-help@gump.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Gump code and data" Reply-To: "Gump code and data" Delivered-To: mailing list general@gump.apache.org Received: (qmail 31215 invoked by uid 99); 17 Jun 2014 04:12:26 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Jun 2014 04:12:26 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy includes SPF record at spf.trusted-forwarder.org) Received: from [178.254.33.213] (HELO samaflost.de) (178.254.33.213) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Jun 2014 04:12:21 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by samaflost.de (Postfix) with ESMTP id 98429588D165 for ; Tue, 17 Jun 2014 06:11:58 +0200 (CEST) Received: from samaflost.de ([127.0.0.1]) by localhost (v35516.1blu.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bvLD7k7Qp0RR for ; Tue, 17 Jun 2014 06:11:50 +0200 (CEST) Received: by samaflost.de (Postfix, from userid 1000) id BD78B588D081; Tue, 17 Jun 2014 06:11:49 +0200 (CEST) From: Stefan Bodewig To: general@gump.apache.org Subject: merging trunk into live branch? Date: Tue, 17 Jun 2014 06:11:48 +0200 Message-ID: <87vbs02n0b.fsf@v35516.1blu.de> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Virus-Checked: Checked by ClamAV on apache.org Hi all Gump's code currently exists in two branches, live and trunk. live is what is used by vmgump, trunk used to be the base for the FreeBSD zone. Now that there only is a single Gump instance there is little value in trunk. The major difference between the branches is how the code deals with SCM update problems. This is an error condition in trunk but only a lig statement in live. This was not merged into live to avoid too many builds from being skipped because of failed dependencies, I don't think this is a real concern with our reduced set of projects anymore. So I'd like to (carefully) merge trunk into live and remove trunk. Any objections? Stefan --------------------------------------------------------------------- To unsubscribe, e-mail: general-unsubscribe@gump.apache.org For additional commands, e-mail: general-help@gump.apache.org