From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Eric S. Raymond" Newsgroups: gmane.emacs.devel Subject: Re: ESR's intimidatingly huge task list Date: Sat, 11 Jan 2014 15:50:18 -0500 Organization: Eric Conspiracy Secret Labs Message-ID: <20140111205018.GA17111@thyrsus.com> References: <20140111165635.D683C3803A6@snark.thyrsus.com> <1836151.BLPShGdEM7@descartes> Reply-To: esr@thyrsus.com NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1389473428 27305 80.91.229.3 (11 Jan 2014 20:50:28 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 11 Jan 2014 20:50:28 +0000 (UTC) Cc: emacs-devel@gnu.org To: =?iso-8859-1?Q?R=FCdiger?= Sonderfeld Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Jan 11 21:50:35 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 1W25Vn-0007Cx-F8 for ged-emacs-devel@m.gmane.org; Sat, 11 Jan 2014 21:50:31 +0100 Original-Received: from localhost ([::1]:35418 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W25Vn-0001eL-3x for ged-emacs-devel@m.gmane.org; Sat, 11 Jan 2014 15:50:31 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47321) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W25Vf-0001eG-Ki for emacs-devel@gnu.org; Sat, 11 Jan 2014 15:50:27 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W25Vb-0005PC-Jq for emacs-devel@gnu.org; Sat, 11 Jan 2014 15:50:23 -0500 Original-Received: from static-71-162-243-5.phlapa.fios.verizon.net ([71.162.243.5]:53376 helo=snark.thyrsus.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W25Vb-0005P6-FM for emacs-devel@gnu.org; Sat, 11 Jan 2014 15:50:19 -0500 Original-Received: by snark.thyrsus.com (Postfix, from userid 1000) id 83EF13803A6; Sat, 11 Jan 2014 15:50:18 -0500 (EST) Content-Disposition: inline In-Reply-To: <1836151.BLPShGdEM7@descartes> X-Eric-Conspiracy: There is no conspiracy User-Agent: Mutt/1.5.21 (2010-09-15) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 71.162.243.5 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:168122 Archived-At: R=FCdiger Sonderfeld : > On Saturday 11 January 2014 11:56:35 Eric S. Raymond wrote: > > * Better cross-VCS integration of smerge in vc.el. Here are Stefan's > > requirements: > >=20 > > - Improve vc-git.el so that it can automatically enable smerge-mode = when > > opening a conflicted file and (probably conditional on a config va= r) > > mark the file as "not conflicted any more" when saving with no > > remaining diff3 markers. > > This currently works in vc-bzr.el (and vc-svn.el as well, IIRC). > >=20 > > - Improve vc-git.el with vc-git-conflicted-files so that > > vc-find-conflicted-files works for Git as well. >=20 > See my patch proposal: > https://lists.gnu.org/archive/html/emacs-devel/2014-01/msg01038.html >=20 > Regards, > R=FCdiger Thanks, that will help. --=20 Eric S. Raymond