From owner-svn-ports-all@FreeBSD.ORG  Wed Aug  8 16:46:22 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx2.freebsd.org (mx2.freebsd.org [69.147.83.53])
	by hub.freebsd.org (Postfix) with ESMTP id DB9C61065670;
	Wed,  8 Aug 2012 16:46:22 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from [127.0.0.1] (hub.freebsd.org [IPv6:2001:4f8:fff6::36])
	by mx2.freebsd.org (Postfix) with ESMTP id 5C72F14E404;
	Wed,  8 Aug 2012 16:46:10 +0000 (UTC)
Message-ID: <502297D2.8070305@FreeBSD.org>
Date: Wed, 08 Aug 2012 09:46:10 -0700
From: Doug Barton <dougb@FreeBSD.org>
Organization: http://www.FreeBSD.org/
User-Agent: Mozilla/5.0 (X11; Linux x86_64;
	rv:14.0) Gecko/20120714 Thunderbird/14.0
MIME-Version: 1.0
To: Bryan Drewery <bdrewery@freebsd.org>
References: <201208081246.q78CkMJf084866@svn.freebsd.org>
	<50226EC7.7090400@FreeBSD.org>
In-Reply-To: <50226EC7.7090400@FreeBSD.org>
X-Enigmail-Version: 1.4.3
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, eadler@freebsd.org,
	ports-committers@freebsd.org
Subject: Re: svn commit: r302285 - in head: audio/gmpc-mserver
	multimedia/xbmc
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Aug 2012 16:46:23 -0000

On 08/08/2012 06:51 AM, Bryan Drewery wrote:
> On 8/8/2012 7:46 AM, Bryan Drewery wrote:
>> Author: bdrewery
>> Date: Wed Aug  8 12:46:21 2012
>> New Revision: 302285
>> URL: http://svn.freebsd.org/changeset/ports/302285
>>
>> Log:
>>   Chase www/libmicrohttpd shlib version bump
>>   
>>   Approved by:	eadler (mentor)
>>
>> Modified:
>>   head/audio/gmpc-mserver/Makefile
>>   head/multimedia/xbmc/Makefile
>>
> 
> We may have done this wrong in terms of MFCing 1 commit to another
> branch, but our thinking was around reverts. If we reverted the
> libmicrohttpd update, we wouldn't want to revert the revision bumps. But
> if we did revert, we would need to bump the revisions again to downgrade
> their dependencies.
> 
> So I'm not sure what the best thing here is now with SVN.
> 
> Anyone else have thoughts?

Short answer: Always do related changes together in the same commit.

Longer answer:

In a theoretical future where we would need to merge from head into a
stable ports branch you wouldn't do the merge until you were confident
that the changes were correct. So worst case scenario you'd first merge
the initial big change, then merge any followup fixes, then commit it
all together.

If for whatever reason you had to revert the update to the libmicrohttpd
port in head you can do a partial revert of the larger commit.

hth,

Doug