From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?ISO-8859-1?Q?R=FCdiger?= Sonderfeld Newsgroups: gmane.emacs.devel Subject: Re: git conversion trial repository #5 Date: Sun, 18 May 2014 18:18:06 +0200 Message-ID: <3001582.cpMS709jHo@descartes> References: <20140515083817.3E5A1380391@snark.thyrsus.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1400429926 19679 80.91.229.3 (18 May 2014 16:18:46 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 18 May 2014 16:18:46 +0000 (UTC) Cc: "Eric S. Raymond" To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun May 18 18:18:40 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 1Wm3nK-0002WL-B7 for ged-emacs-devel@m.gmane.org; Sun, 18 May 2014 18:18:38 +0200 Original-Received: from localhost ([::1]:44049 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wm3nJ-00039W-S4 for ged-emacs-devel@m.gmane.org; Sun, 18 May 2014 12:18:37 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:48895) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wm3nC-00039L-J2 for emacs-devel@gnu.org; Sun, 18 May 2014 12:18:36 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wm3n6-0002mp-ID for emacs-devel@gnu.org; Sun, 18 May 2014 12:18:30 -0400 Original-Received: from ptmx.org ([178.63.28.110]:53368) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wm3n6-0002mf-CW; Sun, 18 May 2014 12:18:24 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by ptmx.org (Postfix) with ESMTP id 3B2222AB72; Sun, 18 May 2014 18:18:22 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at ptmx.org Original-Received: from ptmx.org ([127.0.0.1]) by localhost (ptmx.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MaszL6UJLxE3; Sun, 18 May 2014 18:18:19 +0200 (CEST) Original-Received: from descartes.localnet (chello080108246092.7.14.vie.surfer.at [80.108.246.92]) by ptmx.org (Postfix) with ESMTPSA id 940462AB51; Sun, 18 May 2014 18:18:18 +0200 (CEST) User-Agent: KMail/4.13 (Linux/3.13.0-24-generic; KDE/4.13.0; x86_64; ; ) In-Reply-To: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 178.63.28.110 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:171926 Archived-At: Hello, On Thursday 15 May 2014 16:20:55 Glenn Morris wrote: > Eric S. Raymond wrote: > > A couple of work items remain on my list for after 24.4 release and= > > before the conversion, most notably merging and testing R=C3=BCdige= r > > Sonderfeld's improvement for vc.el. >=20 > There's no reason this needs to wait for the 24.4 release. > The Emacs trunk is open for these kind of improvements. > (Also R=C3=BCdiger has write access, so can commit things himself.) the problem is that my patch results in git being called twice for ever= y=20 file[1]. I proposed a solution changing vc-git to add a `conflicted'=20= marker[2] but since I'm not very familiar with the vc.el and vc-git int= ernals=20 I don't feel competent enough to introduce such a change without some=20= feedback. Regards, R=C3=BCdiger [1] https://lists.gnu.org/archive/html/emacs-devel/2014-01/msg01126.htm= l [2] https://lists.gnu.org/archive/html/emacs-devel/2014-01/msg01271.htm= l