From users-return-27896-apmail-subversion-users-archive=subversion.apache.org@subversion.apache.org Wed Mar 20 15:25:49 2019 Return-Path: X-Original-To: apmail-subversion-users-archive@minotaur.apache.org Delivered-To: apmail-subversion-users-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B5C22195C1 for ; Wed, 20 Mar 2019 15:25:48 +0000 (UTC) Received: (qmail 92315 invoked by uid 500); 20 Mar 2019 15:25:48 -0000 Delivered-To: apmail-subversion-users-archive@subversion.apache.org Received: (qmail 92283 invoked by uid 500); 20 Mar 2019 15:25:48 -0000 Mailing-List: contact users-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list users@subversion.apache.org Received: (qmail 92266 invoked by uid 99); 20 Mar 2019 15:25:47 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Mar 2019 15:25:47 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 32F8AC0597 for ; Wed, 20 Mar 2019 15:25:47 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -0.8 X-Spam-Level: X-Spam-Status: No, score=-0.8 tagged_above=-999 required=6.31 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001, URIBL_BLOCKED=0.001] autolearn=disabled Authentication-Results: spamd4-us-west.apache.org (amavisd-new); dkim=pass (2048-bit key) header.d=daniel.shahaf.name header.b=l4YOEXPk; dkim=pass (2048-bit key) header.d=messagingengine.com header.b=KPDV+NCu Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id yA91i_vbL3eK for ; Wed, 20 Mar 2019 15:25:45 +0000 (UTC) Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com [66.111.4.29]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with ESMTPS id 36B2860D94 for ; Wed, 20 Mar 2019 15:25:45 +0000 (UTC) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id E4E21231C6; Wed, 20 Mar 2019 11:25:44 -0400 (EDT) Received: from imap27 ([10.202.2.77]) by compute3.internal (MEProxy); Wed, 20 Mar 2019 11:25:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= daniel.shahaf.name; h=mime-version:message-id:in-reply-to :references:date:from:to:cc:subject:content-type; s=fm2; bh=7avv d6yEJGsMzuQ4Yjd6/VgpACBaapJb5tKQ6wIl5nk=; b=l4YOEXPkQsZg3QFnkKOj bOVXn5pUJUORQ2GRp3vKOxhDdkIjB8sLRfK2Xih1/RIwunh6ywcYYlUcjZfWLIhZ B158///6dmCfiZbs1uEqCZjKZz/+6p+xA1u969T1HhekSNOY197fq8zYSLwGl168 Ejrf7zDIj8EMj3OVX4nqyaylC6AsC6w9+0lw43gJByQ3XCbh/rs6mkCkNMndY0Wg N4HTnIRwB0+/j1tAjXhhWcHMilvvDCk/c/oxlGSULXZslwOFga6Kh3wpc4RUnT6h /hI0MwohcWMC7jF0bPRFGwUZH6KpPMZKTS5UG23Cio1Y7hLP6dbZaMxiIVOBofrG iQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=7avvd6 yEJGsMzuQ4Yjd6/VgpACBaapJb5tKQ6wIl5nk=; b=KPDV+NCuGrZDExo84Ubm3P McQ/mrtsbaezhaFWqgtbEEpacFYdQyW/uvyM+dx7s9wKiraoC5k3iDn1OC9Q6Udj iHgezqFN8XpvnLXoYR1qUlcAGlwyGfnh+VF0jy7p4ADnql5oE2bzy6nSga7N3vh3 iyxu+aQUk5KEtlF9CozszMpQmpLTcKzEKaAcMPzz2izJJ80dfrhGCHMzHFQzgTmX SRfCW6aZS7o15V2JeLoK6rzKB/THUZhfADFn/3LefxjVwr8slyRH+rKV35jEPcRI YW0MnCdglVVh+o+lm/ArDegT7we/BvdzDQF7fUA8bdsFJG+EYs7X3AT+nn+GBS4A == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedutddrieeigdejiecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhepofgfggfkjghffffhvffutgesthdtre dtreertdenucfhrhhomhepfdffrghnihgvlhcuufhhrghhrghffdcuoegurdhssegurghn ihgvlhdrshhhrghhrghfrdhnrghmvgeqnecuffhomhgrihhnpehprghulhhhrghmmhgrnh htrdgtohhmpdgrphgrtghhvgdrohhrghenucfrrghrrghmpehmrghilhhfrhhomhepugdr shesuggrnhhivghlrdhshhgrhhgrfhdrnhgrmhgvnecuvehluhhsthgvrhfuihiivgeptd X-ME-Proxy: Received: by mailuser.nyi.internal (Postfix, from userid 501) id A93848467E; Wed, 20 Mar 2019 11:25:43 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.1.5-976-g376b1f3-fmstable-20190314v3 Mime-Version: 1.0 X-Me-Personality: 3897223 Message-Id: <7a8d330d-a7cd-4fc4-a2e7-07cfa9334228@www.fastmail.com> In-Reply-To: References: <49bf9d13.492ac.16999d680f9.Coremail.wuzhouhui14@mails.ucas.ac.cn> Date: Wed, 20 Mar 2019 11:25:43 -0400 From: "Daniel Shahaf" To: Subversion Cc: wuzhouhui Subject: Re: version control model of Subversion source code Content-Type: text/plain I think wuzhouhui wasn't asking about branching models in general, but specifically about what model the Subversion project uses for versioning its own source code (https://svn.apache.org/repos/asf/subversion/). wuzhouhui, your description is accurate. In Subversion's tree changes are committed first to trunk and then backported to release branches via the STATUS files. The process is described in HACKING at . Cheers, Daniel Paul Hammant wrote on Wed, 20 Mar 2019 15:21 +00:00: > You can do any branching model you like with subversion. That said, I > maintain that Trunk-Based Development is the best model, and note that > there are merge issues with other branching models in rare > circumstances [ref > ]. > > On Wed, Mar 20, 2019 at 6:43 AM wuzhouhui wrote: > > Hi, > > > > This question is unrelated to Subversion's usage or issues, but > > related to version control model of Subversion source code. Let > > me explain in detail. > > > > As far as I know, new code is committed to trunk firstly, then > > cherry-picked to release-branch in necessary, so the branch-view > > of Subversion is following (cp stands for cherry-pick): > > > > -----------o--------------------o----------- 1.10.x > > / / > > cp cp > > / / > > --------o---------o--------o---------o-----o trunk > > \ \ \ > > cp cp cp > > \ \ \ > > ------------o---------o-------------------o 1.11.x > > > > And tags are always created on release-branch. > > > > Am I right?