From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Git transition checklist Date: Wed, 08 Jan 2014 12:19:41 -0500 Message-ID: References: <20140108135200.8ECF9380834@snark.thyrsus.com> <20140108164855.GD3877@thyrsus.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1389201596 31421 80.91.229.3 (8 Jan 2014 17:19:56 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 8 Jan 2014 17:19:56 +0000 (UTC) Cc: emacs-devel@gnu.org To: "Eric S. Raymond" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Jan 08 18:20:01 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 1W0wnP-0006s5-KZ for ged-emacs-devel@m.gmane.org; Wed, 08 Jan 2014 18:19:59 +0100 Original-Received: from localhost ([::1]:48039 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0wnP-0003mh-6F for ged-emacs-devel@m.gmane.org; Wed, 08 Jan 2014 12:19:59 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40892) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0wnF-0003cH-G5 for emacs-devel@gnu.org; Wed, 08 Jan 2014 12:19:56 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W0wn7-00064P-V7 for emacs-devel@gnu.org; Wed, 08 Jan 2014 12:19:49 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:26585) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0wn7-00064K-Rq for emacs-devel@gnu.org; Wed, 08 Jan 2014 12:19:41 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av4EABK/CFFFxKG9/2dsb2JhbAA7Cb8OF3OCHgEBBAEnLyMFCws0EhQYDSSIHgbBLY0Wg3QDiGGcGYFegxU X-IPAS-Result: Av4EABK/CFFFxKG9/2dsb2JhbAA7Cb8OF3OCHgEBBAEnLyMFCws0EhQYDSSIHgbBLY0Wg3QDiGGcGYFegxU X-IronPort-AV: E=Sophos;i="4.84,565,1355115600"; d="scan'208";a="44487452" Original-Received: from 69-196-161-189.dsl.teksavvy.com (HELO pastel.home) ([69.196.161.189]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 08 Jan 2014 12:19:41 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id 35D4F60F7D; Wed, 8 Jan 2014 12:19:41 -0500 (EST) In-Reply-To: <20140108164855.GD3877@thyrsus.com> (Eric S. Raymond's message of "Wed, 8 Jan 2014 11:48:55 -0500") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.181 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:167755 Archived-At: > I don't know what to tell you. *I* may misunderstand; I don't know bzr > well enough to suggest an alternative or write a procedure, and on top > of everything else I need to do it is highly unlikely that I will be > able to learn bzr well enough to change that. > > If branch transplant is to be to be automated, I think it's going > to fall on you or Eli to do it. I'd expect that if git-remote-bzr is used for the conversion of the Bzr repository into a Git repository, git-remote-bzr will also correctly convert any personal branch, but I don't know those bzr->git conversion tools to know which tool people want to use to do the conversion nor whether this tool does work on external branches. >> > - Improve vc-git.el so that it can automatically enable smerge-mode when >> > opening a conflicted file and (probably conditional on a config var) >> > 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). >> > >> > - Improve vc-git.el with vc-git-conflicted-files so that >> > vc-find-conflicted-files works for Git as well. [...] > I'm going to need a very detailed soecification of what you want, then. > You can't assume I know what the bzr behvior looks like, either. It's in the text you quoted (and which I re-quoted above as well for convenience). It's got nothing to do with Bzr (except for the fact that vc-bzr.el does implement those features). > I could do this - that is, create a maintainer identity and do all the > cryptosigning. Then I could hand you the private key. You'd have to > trust me not to keep a copy and use it for nefarious ends. :-) Can't be much worse than the current status quo. Stefan