From owner-freebsd-hackers@freebsd.org Thu May 17 06:38:17 2018 Return-Path: Delivered-To: freebsd-hackers@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 532D6EB1F67 for ; Thu, 17 May 2018 06:38:17 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: from mail-yw0-x241.google.com (mail-yw0-x241.google.com [IPv6:2607:f8b0:4002:c05::241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E75676E962 for ; Thu, 17 May 2018 06:38:16 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: by mail-yw0-x241.google.com with SMTP id q7-v6so1007865ywd.9 for ; Wed, 16 May 2018 23:38:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eitanadler.com; s=0xdeadbeef; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=ORl3WPO4+V4i0QTYQndtezbrzq0M5FzAGwyT69BzFvU=; b=P78Mq1Y1X8aS11KkHcABaBhFE5kMmhNnrYdCmSf5iiffqDHmD1dj9fn+6m2PChUVdE TWnTpY264grI4OKC8JQb7fmG+MBgX0odof4DbVx3YIJKhdSRNuOz3BHO+qrh1tZunX9r wzuKuBZLF5/aDeMj4BKoYcoOeVuITMTOtDoXY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=ORl3WPO4+V4i0QTYQndtezbrzq0M5FzAGwyT69BzFvU=; b=cI8rDfHF8jYmNFUPC4SjrACZinGQPAc9VT543lBgxBe86OuYzuJHSpvZxpJI7OwDsj d6oDDowW0Jyxid3ZdN+Cpm22Mall55y2pvsqIyckK9BBS2m1nSU+exow6to9B6X9nTg6 3UYtftNNSGWYCyPKg20YZdGx19C/MmX5K04QWNcZRtAhak9pOFHWh0/C/+T1Ul/N5ghD iYwSjeRoyW/yrMgZqNsVpVFbuxlE19THIR0rbn8KoHWd85uDR9u9l0DX/NDW1HWrkmyh 15Njbkr4OKnBxbPJQ80wzu8KZKUZmzNSQJN7l9zLwfWIPtYm4V6hHRgyRN9JwlOhLOdS bPsw== X-Gm-Message-State: ALKqPwc+q4j8HepbMGrZt8oOF6as0eh76qo5G9LGZgj/4xAcFVxRfg3n agDHb3Kw9cIeHGSbZ1N6Ud8Cv8l+okO9cGV+oSD+XQ== X-Google-Smtp-Source: AB8JxZoB8gaf6cfFSPr3tnUQx1Tm84WH+h9aaBRQyVV2DSORpMSW9bRRhPh6sTnD3mCY0WDigQ/k6+xpgSFXLlSqOHg= X-Received: by 2002:a81:8605:: with SMTP id w5-v6mr1840103ywf.162.1526539096146; Wed, 16 May 2018 23:38:16 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a25:c709:0:0:0:0:0 with HTTP; Wed, 16 May 2018 23:37:45 -0700 (PDT) In-Reply-To: References: From: Eitan Adler Date: Wed, 16 May 2018 23:37:45 -0700 Message-ID: Subject: Re: including a checksum of the diff in uname To: Mateusz Guzik Cc: FreeBSD Hackers Content-Type: text/plain; charset="UTF-8" X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2018 06:38:17 -0000 On 12 May 2018 at 19:50, Mateusz Guzik wrote: > On Sun, May 13, 2018 at 4:41 AM, Eitan Adler wrote: >> >> Hi all, >> >> I often have several variants of the same revision that I'm testing or >> working on at any given time. >> >> What do you y'all think of something like this: >> >> Index: sys/conf/newvers.sh >> =================================================================== >> --- sys/conf/newvers.sh (revision 333575) >> +++ sys/conf/newvers.sh (working copy) >> @@ -203,6 +203,8 @@ if [ -n "$svnversion" ] ; then >> [0-9]*[MSP]|*:*) >> svn=" r${svn}" >> modified=true >> + ck="$(svn diff | cksum | cut -w -f 1)" >> + svn="$svn-$ck" >> ;; >> [0-9]*) >> svn=" r${svn}" >> >> to help differentiate. >> >> You end up with a version that looks like: r333575M-4294967295? >> > > Don't develop with svn. get yourself a git or hg setup and a tmp branch. > The branch name is always included along with the commit hash. That makes sense, and I might do that in the future. In the past adding files was more painful with git, though I'm told this is no longer the case. In any case, is there any reason not to add the above patch? -- Eitan Adler