From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Daniel Colascione Newsgroups: gmane.emacs.devel Subject: Re: dealing with local patches - mercurial queues over bzr/git checkout Date: Mon, 06 Jan 2014 12:09:51 -0800 Message-ID: <52CB0D8F.1080006@dancol.org> References: <1389035494635-308685.post@n5.nabble.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1389038998 681 80.91.229.3 (6 Jan 2014 20:09:58 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 6 Jan 2014 20:09:58 +0000 (UTC) To: Jarek Czekalski , Emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 06 21:10:05 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1W0GUu-0002Mi-IU for ged-emacs-devel@m.gmane.org; Mon, 06 Jan 2014 21:10:04 +0100 Original-Received: from localhost ([::1]:37396 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0GUu-0004s5-32 for ged-emacs-devel@m.gmane.org; Mon, 06 Jan 2014 15:10:04 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58366) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0GUr-0004oM-Bk for Emacs-devel@gnu.org; Mon, 06 Jan 2014 15:10:02 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W0GUq-0000uI-Eb for Emacs-devel@gnu.org; Mon, 06 Jan 2014 15:10:01 -0500 Original-Received: from dancol.org ([2600:3c01::f03c:91ff:fedf:adf3]:48816) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0GUp-0000uE-Vv for Emacs-devel@gnu.org; Mon, 06 Jan 2014 15:10:00 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=dancol.org; s=x; h=Content-Transfer-Encoding:Content-Type:In-Reply-To:References:Subject:To:MIME-Version:From:Date:Message-ID; bh=axfdP69Iv+N3DdDtFtUW9UZZefpMa2e0c2cthkfSIa0=; b=mnr1k0+egPrR20wdxRkIOPuABFck1GyXN8e1eXcpmEZ4DBqtuSISB8CKGgWhv/CfKTs7bX5a1w2aMvLw6FCdDYFD4EfHCjnUW84fXrSWDXibXTSDzox8EuWsUU3jS6VSpuKUaxU8w6mM70aS429NEitVACMuTc8aUx0/uLLymA92ul6LZZGHjsamkXqQ3ZdzPBhq2kbm4CYnI7Gs3GsZqt4ztPBY6f+AyRmkrgICElgyXPRkfxvvsLwnev6DLbkgp/AfhL3qHfU7XUmY9QO5bdJC/3ZK57Wllg2XHlpaVWMOm0Xy8P20UynpJXDWg1+V7muN1xtHZeR63BCxjHX1Jw==; Original-Received: from [2620:0:1cfe:99::9] by dancol.org with esmtpsa (TLS1.0:DHE_RSA_CAMELLIA_256_CBC_SHA1:256) (Exim 4.80) (envelope-from ) id 1W0GUo-0007XV-8D; Mon, 06 Jan 2014 12:09:58 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.2.0 In-Reply-To: <1389035494635-308685.post@n5.nabble.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2600:3c01::f03c:91ff:fedf:adf3 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:167512 Archived-At: On 01/06/2014 11:11 AM, Jarek Czekalski wrote: > [this message is sent with 1 day delay - gnu.org seems to ignore my direct > emails] > I was thinking of writing about this since long, but now it may be more > important. The discussion concentrates on a change to the version control > system, so that it be better for the devs. > > In my approach I don't pay much attention to the version control system used > by a project, because I always init a mercurial repository on top of it. > Then I use mercurial queues concept. This is a very convenient way of > maintaining local patches. The patches are stored as raw patch files and the > mercurial interface provides means of applying, reverting and reordering the > patches. quilt needs that approach, but git's is far cleaner because it's integrated into the VCS. There's no need for a queue setup when git's branches have all the required functionality. Mercurial's artificial distinction between branches and other kinds of change groupings is one of the things I dislike most about the system. I feel strongly that git got it fundamentally right and Mercurial got it fundamentally wrong.