From owner-svn-ports-all@freebsd.org  Mon May  1 03:32:07 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B8CCED58A3C;
 Mon,  1 May 2017 03:32:07 +0000 (UTC) (envelope-from adamw@adamw.org)
Received: from apnoea.adamw.org (apnoea.adamw.org [104.225.5.94])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "apnoea.adamw.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 067DB89;
 Mon,  1 May 2017 03:32:06 +0000 (UTC) (envelope-from adamw@adamw.org)
Received: by apnoea.adamw.org (OpenSMTPD) with ESMTPSA id e1cdb2ee
 TLS version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO;
 Sun, 30 Apr 2017 21:32:04 -0600 (MDT)
Content-Type: text/plain; charset=us-ascii
Mime-Version: 1.0 (Mac OS X Mail 10.3 \(3273\))
Subject: Re: svn commit: r439857 - head/Tools/scripts
From: Adam Weinberger <adamw@adamw.org>
In-Reply-To: <f42e6986-a21b-3ae9-0420-cb55813db3ef@FreeBSD.org>
Date: Sun, 30 Apr 2017 21:32:02 -0600
Cc: Adam Weinberger <adamw@FreeBSD.org>, ports-committers@freebsd.org,
 svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Content-Transfer-Encoding: quoted-printable
Message-Id: <A4702787-7080-4E6E-8299-E421E67FEC73@adamw.org>
References: <201705010106.v4116FXA066287@repo.freebsd.org>
 <f42e6986-a21b-3ae9-0420-cb55813db3ef@FreeBSD.org>
To: koobs@FreeBSD.org
X-Mailer: Apple Mail (2.3273)
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 May 2017 03:32:07 -0000

> On 30 Apr, 2017, at 21:23, Kubilay Kocak <koobs@FreeBSD.org> wrote:
>=20
> On 5/1/17 11:06 AM, Adam Weinberger wrote:
>> Author: adamw Date: Mon May  1 01:06:15 2017 New Revision: 439857=20
>> URL: https://svnweb.freebsd.org/changeset/ports/439857
>>=20
>> Log: Add some usage instructions to the top of the mfh script. In
>> particular, note that multiple revisions should appear
>> chronologically.
>>=20
>> Modified: head/Tools/scripts/mfh
>>=20
>> Modified: head/Tools/scripts/mfh=20
>> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
>>=20
>>=20
> --- head/Tools/scripts/mfh	Mon May  1 00:59:29 2017	=
(r439856)
>> +++ head/Tools/scripts/mfh	Mon May  1 01:06:15 2017	=
(r439857) @@ -1,6
>> +1,12 @@ #!/bin/sh # # mfh - Merge from head to a given branch +# +#
>> Usage: mfh [<branch>] <revnumber> [<revnumber>] +#   <branch> is
>> optional and defaults to latest branch +#   If supplying multiple
>> revnumbers, put them in chronological order +#     (111111 111112
>> 111113) +# # Copyright 2013 Baptiste Daroussin # All rights
>> reserved. #
>>=20
>=20
> What is the impact if they are not sorted?

If later commits depend on the previous commits, the later commits can't =
apply and are seen as merge conflicts.

> Could the script be made to sort the provided revision numbers,
> precluding the need for the committers to remember to sort them?

Absolutely. Is there any scenario where applying them in =
non-chronological order solves a problem? As long as the goal is to end =
up where HEAD is (or was), I can't see non-chronological being a good =
thing.

# Adam


--=20
Adam Weinberger
adamw@adamw.org
https://www.adamw.org