From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Engster Newsgroups: gmane.emacs.devel Subject: Re: master c6f03ed: Fix a problem in url.el without GnuTLS Date: Sat, 13 Dec 2014 11:16:47 +0100 Message-ID: <87388jrh0w.fsf@engster.org> References: <20141211155740.11916.1584@vcs.savannah.gnu.org> <87ppbquo97.fsf@gmail.com> <83zjaurreb.fsf@gnu.org> <874mt14wrc.fsf@lifelogs.com> <83egs5rzlr.fsf@gnu.org> <877fxx2e6t.fsf@lifelogs.com> <83a92trlgs.fsf@gnu.org> <87oar81jlp.fsf@lifelogs.com> <83lhmcq8l5.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1418465833 27261 80.91.229.3 (13 Dec 2014 10:17:13 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 13 Dec 2014 10:17:13 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Dec 13 11:17:07 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 1Xzjl3-0001DN-Te for ged-emacs-devel@m.gmane.org; Sat, 13 Dec 2014 11:17:06 +0100 Original-Received: from localhost ([::1]:60785 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xzjl3-0005w5-CS for ged-emacs-devel@m.gmane.org; Sat, 13 Dec 2014 05:17:05 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39446) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xzjku-0005vm-TS for emacs-devel@gnu.org; Sat, 13 Dec 2014 05:17:02 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xzjko-0008WK-Ra for emacs-devel@gnu.org; Sat, 13 Dec 2014 05:16:56 -0500 Original-Received: from randomsample.de ([5.45.97.173]:44349) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xzjko-0008WG-If; Sat, 13 Dec 2014 05:16:50 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=randomsample.de; s=a; h=Content-Type:MIME-Version:Message-ID:Date:References:In-Reply-To:Subject:Cc:To:From; bh=kWQtD3/kEreW3IcDr9mQb0epZq7n8M1qw+5idq5L0mY=; b=U+RGanjdRO4a3ZDFUWqbdX6k+Y9+EkyqevLseQ0hgRZBL72lX706PNQLfy8MBdVixX2cYIx9vRj895kK4BMzuDvniHxhWw8dTRqbLxhUko/IyksIGviKLsuREdMJHVPa; Original-Received: from ip4d154cb9.dynamic.kabel-deutschland.de ([77.21.76.185] helo=spaten) by randomsample.de with esmtpsa (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1Xzjkn-0001DQ-J0; Sat, 13 Dec 2014 11:16:49 +0100 In-Reply-To: <83lhmcq8l5.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 13 Dec 2014 10:04:22 +0200") User-Agent: Gnus/5.13001 (Ma Gnus v0.10) Emacs/24.3.91 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 5.45.97.173 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:179986 Archived-At: Eli Zaretskii writes: > David, is it possible to enhance gitmerge.el to take care of that > automatically? Otherwise I predict that people will keep making these > mistakes forever. I was hoping that gitmerge already does it, since I lifted the ChangeLog merge stuff directly from bzrmerge, which AFAIK also did the date fixes. I'll take a look why that doesn't work anymore. -David