Date: Sun, 13 May 2018 04:50:35 +0200 From: Mateusz Guzik <mjguzik@gmail.com> To: Eitan Adler <lists@eitanadler.com> Cc: FreeBSD Hackers <freebsd-hackers@freebsd.org> Subject: Re: including a checksum of the diff in uname Message-ID: <CAGudoHEupAa0gk03KYwt=AHrWXAjdwS5tjqW1A5NV92sULO-qw@mail.gmail.com> In-Reply-To: <CAF6rxgmL559nLMT8WeEQhscHjVgO8O0Nr-sA7Jf5pvtUKk7T_Q@mail.gmail.com> References: <CAF6rxgmL559nLMT8WeEQhscHjVgO8O0Nr-sA7Jf5pvtUKk7T_Q@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sun, May 13, 2018 at 4:41 AM, Eitan Adler <lists@eitanadler.com> 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.
The benefit is that not only know you know what the change is, you can
always refer back to it later and diff against something else.
--
Mateusz Guzik <mjguzik gmail.com>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAGudoHEupAa0gk03KYwt=AHrWXAjdwS5tjqW1A5NV92sULO-qw>