From owner-freebsd-current@freebsd.org Sat Jan 23 21:48:26 2021 Return-Path: Delivered-To: freebsd-current@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 416904DF059 for ; Sat, 23 Jan 2021 21:48:26 +0000 (UTC) (envelope-from mueller6722@twc.com) Received: from p-impout005.msg.pkvw.co.charter.net (p-impout005aa.msg.pkvw.co.charter.net [47.43.26.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DNVB104Xgz3FsJ for ; Sat, 23 Jan 2021 21:48:24 +0000 (UTC) (envelope-from mueller6722@twc.com) Received: from localhost ([96.28.177.163]) by cmsmtp with ESMTP id 3QZglZBoNbGHJ3QZgl3fKa; Sat, 23 Jan 2021 21:36:05 +0000 X-Authority-Analysis: v=2.3 cv=A5oSwJeG c=1 sm=1 tr=0 a=xqrt2BZAGHte7XHhrxJgbA==:117 a=xqrt2BZAGHte7XHhrxJgbA==:17 a=HpEJnUlJZJkA:10 a=OsXUjnJtyZBgATbdD1sA:9 Date: Sat, 23 Jan 2021 21:34:56 +0000 From: "Thomas Mueller" To: freebsd-current@freebsd.org Reply-To: freebsd-current@freebsd.org Subject: RE: Which branch in git is 13.0-current? References: <86h7n7a9jx.fsf@gmail.com> <000001d6f1a8$dcd03280$96709780$@gmail.com> <86ft2ra80q.fsf@gmail.com> <004101d6f1ac$62a619d0$27f24d70$@gmail.com> X-CMAE-Envelope: MS4wfNDOatjU1aRSQEVT+oONmkMHXqEdzQEqEctM9+TEHJxgWR3xrm2BD68I/x+oLG8yedDdTkQSM2mBiA9tryUrXjpyMpPOgPdWi6KVuavQVALC0R05eI1Q WKNtjYOgDIvxyvZiLbNyLwSN7k4IZBHOjQN1etskvD/LBnaKehqphVX1 X-Rspamd-Queue-Id: 4DNVB104Xgz3FsJ X-Spamd-Bar: ++++++++++ X-Spamd-Result: default: False [11.00 / 15.00]; HAS_REPLYTO(0.00)[freebsd-current@freebsd.org]; FREEMAIL_FROM(0.00)[twc.com]; R_SPF_ALLOW(-0.20)[+ip4:47.43.26.0/24]; TO_DN_NONE(0.00)[]; RECEIVED_SPAMHAUS_PBL(0.00)[96.28.177.163:received]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[47.43.26.136:from]; FREEMAIL_ENVFROM(0.00)[twc.com]; ASN(0.00)[asn:40294, ipnet:47.43.24.0/21, country:US]; FROM_EQ_ENVFROM(0.00)[]; ARC_NA(0.00)[]; REPLYTO_EQ_TO_ADDR(5.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_SPAM_SHORT(0.80)[0.798]; MIME_GOOD(-0.10)[text/plain]; R_DKIM_NA(0.00)[]; DMARC_NA(0.00)[twc.com]; NEURAL_SPAM_MEDIUM(1.00)[1.000]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[47.43.26.136:from:127.0.2.255]; SUBJECT_ENDS_QUESTION(1.00)[]; MISSING_MID(2.50)[]; NEURAL_SPAM_LONG(1.00)[1.000]; RCVD_TLS_LAST(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[47.43.26.136:from]; RCVD_COUNT_TWO(0.00)[2]; GREYLIST(0.00)[pass,body]; MAILMAN_DEST(0.00)[freebsd-current] X-Spam: Yes X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Jan 2021 21:48:26 -0000 > > Does that mean CURRENT is now 14.0? I must have missed the > > announcement. > That is correct, 13-stable has been branched from 13-current which has now > been bumped to 14-current. > Because it's a major version change going from 13 to 14, pkg is a bit > agitated regarding the ABI. > > > Dries There should have been announcements of the src tree branch on current and stable emailing lists! My question is how, using git, to track both 13-stable and 14-current without having entirely separate trees as I had to do with cvs and svn. I think there is a git worktree command but can't remember how I used it, with Haiku in that case. Then I will want to know how to determine which tree I will be compiling. Tom