From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com [209.85.212.181]) by dpdk.org (Postfix) with ESMTP id 08E577E89 for ; Tue, 21 Oct 2014 10:38:40 +0200 (CEST) Received: by mail-wi0-f181.google.com with SMTP id hi2so1148857wib.2 for ; Tue, 21 Oct 2014 01:46:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:organization :user-agent:in-reply-to:references:mime-version :content-transfer-encoding:content-type; bh=xBKokyUbfaEqCQksMY9AaMPAgq0jzlZLbhz6C9AoZcM=; b=SRBR/aohts28Nh1KKQ100qZsfQxUeuVJexxx8n+npl3+roAC4P5P8e9pZisHL3qU+4 OWcAVFC5/g1JEUy35g6EwRzNNCFDyPAtAmRBbXyDd2nSaO7qAXHiYyzPbq+CrAd/Dh4m p9EPszlfrTkBgoXxB3t9Lih3loyX0i262v2jilDYH6W23OvytJa+Tn+pmRpzkcAFVXCi eLkMHnYvhaq1tGFyF5LpjNioX1RALhC4yl9BWZ749mpxxvo/+UWx/zNykHDSTrQt/vQV 8o0OyunzIJbPj5sAeKv/APK61SWywOoh4V/Ir7JBCMXjKhxK/XMIZzw93dkeg0Mo7RO7 fzQg== X-Gm-Message-State: ALoCoQl0iCJWbPmLI9l/RBrDJc32krgdBV0BM99tTcx9E0z2/qzkd+VhvMawB41cI7pI+envtYxV X-Received: by 10.194.90.15 with SMTP id bs15mr39587837wjb.47.1413881208881; Tue, 21 Oct 2014 01:46:48 -0700 (PDT) Received: from xps13.localnet (136-92-190-109.dsl.ovh.fr. [109.190.92.136]) by mx.google.com with ESMTPSA id l5sm12373715wif.3.2014.10.21.01.46.47 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Oct 2014 01:46:48 -0700 (PDT) From: Thomas Monjalon To: Marc Sune Date: Tue, 21 Oct 2014 10:46:32 +0200 Message-ID: <39275062.2hPoVIfNVy@xps13> Organization: 6WIND User-Agent: KMail/4.14.1 (Linux/3.16.4-1-ARCH; KDE/4.14.1; x86_64; ; ) In-Reply-To: <59AF69C657FD0841A61C55336867B5B0344210F9@IRSMSX103.ger.corp.intel.com> References: <544617E0.80502@bisdn.de> <59AF69C657FD0841A61C55336867B5B0344210F9@IRSMSX103.ger.corp.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Cc: dev@dpdk.org Subject: Re: [dpdk-dev] development/integration branch? X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Oct 2014 08:38:40 -0000 2014-10-21 08:36, Richardson, Bruce: > From: Marc Sune > > Some DPDK users, including myself, use a clone of the git repository to > > compile DPDK for their applications, instead of downloading the tarball > > of each release. > > > > In my opinion, it would be useful for such users that the master branch > > contains only stable releases, to prevent (mistakenly) to use a wip DPDK > > version, and jump quickly to the latest stable with a simple git pull > > without having to check the tags. Also new users would clone the repo > > and get only the stable release. > > > > So I would propose to use an integration/development branch, where the > > patches are integrated and only push to master once a stable release is > > tagged in this integration branch. > > > > Thoughts? > > Ideally, our master branch should always be good and stable, but given > reality often interferes with such good intentions I think that having > dev branches is not a bad idea. However, what we may lose by doing so > is having a larger group of people constantly using the master branch > and reporting problems to us. > > On balance, I'd be slightly in favour of this suggestion. My balance is different because I have a simpler solution for Marc's problem: git fetch && git merge $(git tag | grep -v -- -rc | tail -n1) -- Thomas