From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6451826320254959616 X-Received: by 10.28.45.88 with SMTP id t85mr485391wmt.2.1502192909223; Tue, 08 Aug 2017 04:48:29 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.28.156.74 with SMTP id f71ls1781195wme.5.canary-gmail; Tue, 08 Aug 2017 04:48:28 -0700 (PDT) X-Received: by 10.28.6.76 with SMTP id 73mr541366wmg.4.1502192908952; Tue, 08 Aug 2017 04:48:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502192908; cv=none; d=google.com; s=arc-20160816; b=oJAhHaESzE9/zeZc/WHXRsgemcIMylYU82crlylGaZdlNAAlGTENtQI1D6DsQ4Ga1n UCDg7zpjg4+CTa08KcWfGNsjxyVXxxq3u9qj7T954y2oMJc0UZXgy4tPii42OgljayT8 wgMR8xJqEZIGtUlWt/SDrlS8meIcvTOhiYsRmwmC73fOY5TpxO3G+18857EBWHh3jlJu G7LJpunp7BB1sKM7cirWShw+Ea/vCYNGKQaOiJwCzk51OzU8oyzpGVDFWWiz6X7AXxl6 FBLUu3wBSviTIF+pxXKUqK2XSNEnB8imp9kbWLLhaf7iVkTzTgkiI9ObsrVY3ZfJc/dG +N9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:to:subject :arc-authentication-results; bh=8kXSs+i0IcVRZhoNFamwKtkKl1tzuwei9H4rjPdxB70=; b=Gp2qxDN9z0eay4mHNHga1uTSBIELBOLp56jyJ7Nc81Xn+te+rwMKIBs5n7sbKiZxSt auLHTvsCUEX+kh0vQwxtX7yyb8v//uwu8m+iUwwKDTwbfAdZwB16V03pU48TmtLA2/sf 9WrTXqtD1mtxHkmETHWqARzH1tIia2U0L7ezyCMW5pdZikpy7qcH+8sWPDvcqjC3YPJr CvIXzqdjaKL8ZxWK5TxeyW8vtYItGRjPDkWkNzNzXcyqXeVHR/DJGZgdSOV2BjU8DNBY YYbK7QSAbmFVHp5sfRmnYYPgyoBt9+HnddhRFt6whUJMhKLYha28A+BUKcNEIYxHEEhg fW7w== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 192.35.17.2 is neither permitted nor denied by best guess record for domain of jan.kiszka@siemens.com) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id 2si445073wms.6.2017.08.08.04.48.28 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Aug 2017 04:48:28 -0700 (PDT) Received-SPF: neutral (google.com: 192.35.17.2 is neither permitted nor denied by best guess record for domain of jan.kiszka@siemens.com) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 192.35.17.2 is neither permitted nor denied by best guess record for domain of jan.kiszka@siemens.com) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id v78BmS2n023218 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 8 Aug 2017 13:48:28 +0200 Received: from md1f2u6c.ww002.siemens.net ([139.22.40.193]) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id v78BmGEL013644; Tue, 8 Aug 2017 13:48:17 +0200 Subject: Re: ETOOMANYBRANCHES and Contributing.md To: Henning Schild , isar-users@googlegroups.com References: <20170808110311.1c809aed@md1em3qc> From: Jan Kiszka Message-ID: Date: Tue, 8 Aug 2017 07:48:16 -0400 User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 In-Reply-To: <20170808110311.1c809aed@md1em3qc> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: 7DSQoJlGjV3S On 2017-08-08 05:03, [ext] Henning Schild wrote: > Hi, > > in my point of view upstream Isar has way to many branches and it is > unclear how there are used. > > I propose to clean that up and come up with a description of what the > remaining branches are and what they do.> > Here is how that could be done: > 1. remove personal branches of developers, they should use clones not > upstream > 2. agree on having at least two branches "master" and "next" > - master would be stable and rebasing/force-pushing not allowed > - next would be the rebasing/staging branch for master > 3. everything that goes to master has to sit in next for a while > 4. everything that goes to next has to show up on the mailinglist for > public review ... TODO Contributing.md Right. Historic things shall either be removed or put into some "historic/" namespace if they still keep relevant bits. There has to be an official staging branch. If you and Baurzhan are rotating maintainer roles, make clear who is when in charge, but use the same branch so that contributors can build upon. Jan -- Siemens AG, Corporate Technology, CT RDA ITP SES-DE Corporate Competence Center Embedded Linux