Date: Sun, 30 Apr 2017 21:32:02 -0600 From: Adam Weinberger <adamw@adamw.org> To: koobs@FreeBSD.org Cc: Adam Weinberger <adamw@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r439857 - head/Tools/scripts Message-ID: <A4702787-7080-4E6E-8299-E421E67FEC73@adamw.org> In-Reply-To: <f42e6986-a21b-3ae9-0420-cb55813db3ef@FreeBSD.org> References: <201705010106.v4116FXA066287@repo.freebsd.org> <f42e6986-a21b-3ae9-0420-cb55813db3ef@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?A4702787-7080-4E6E-8299-E421E67FEC73>