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 09:59:53 -0500 Message-ID: References: <20140108135200.8ECF9380834@snark.thyrsus.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1389193204 18158 80.91.229.3 (8 Jan 2014 15:00:04 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 8 Jan 2014 15:00:04 +0000 (UTC) Cc: emacs-devel@gnu.org To: esr@thyrsus.com (Eric S. Raymond) Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Jan 08 16:00:12 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 1W0uc6-0006ho-AL for ged-emacs-devel@m.gmane.org; Wed, 08 Jan 2014 16:00:10 +0100 Original-Received: from localhost ([::1]:47159 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0uc6-0000WB-0O for ged-emacs-devel@m.gmane.org; Wed, 08 Jan 2014 10:00:10 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34744) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0ubw-0000RH-Qq for emacs-devel@gnu.org; Wed, 08 Jan 2014 10:00:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W0ubq-0006Xz-VH for emacs-devel@gnu.org; Wed, 08 Jan 2014 10:00:00 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:36734) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0ubq-0006Xk-S7 for emacs-devel@gnu.org; Wed, 08 Jan 2014 09:59:54 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av8EABK/CFFFxKG9/2dsb2JhbAA7Cb8OF3OCHgEBBAFWGAsFCwsXHRIUGA0WiCwGDMEhjQ8HCYNrA4hhnBmBXoMVgVE X-IPAS-Result: Av8EABK/CFFFxKG9/2dsb2JhbAA7Cb8OF3OCHgEBBAFWGAsFCwsXHRIUGA0WiCwGDMEhjQ8HCYNrA4hhnBmBXoMVgVE X-IronPort-AV: E=Sophos;i="4.84,565,1355115600"; d="scan'208";a="44467661" 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 09:59:53 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id 7A8D8607DB; Wed, 8 Jan 2014 09:59:53 -0500 (EST) In-Reply-To: <20140108135200.8ECF9380834@snark.thyrsus.com> (Eric S. Raymond's message of "Wed, 8 Jan 2014 08:52:00 -0500 (EST)") 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:167730 Archived-At: > That's easy. Make a patch sequence from your bzr branch using sendto > - the format is compatible with GNU patch. git checkout the branch > name at the equivalent point in the git repo. Use GNU patch to apply. > Fill in change comments as required. Sounds like a lot of manual work and it doesn't seem to preserve history (e.g. merges that might have taken place). For a branch with a couple commits that's probably OK, but with my 5 year-old branch it's a non-starter, unless I misunderstand something. >> 7. What about the mail messages to emacs-diffs mailing list? That >> should be working as well, and support pushes to non-trunk >> branches. > That is trivial in git. Andreas can set it up in minutes. I could too, > but I don't have write access to the repo hook files. Savannah has support for Git commit mails (we use them for the `elpa' branch), but they kind of suck: - it's "one mail per push" instead of "one mail per commit" (I can live with that, but it has annoying consequences). - the email's "Subject:" is useless (part of the problem is that since there are several commits in it, you can't just take the first line of *the* commit message, since there are several commit messages). See http://git.savannah.gnu.org/r/emacs/elpa.git/config for the config we currently use. > Stefan Monnier added these: > > - 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. > > Thierry Volpiatto pointed out that these issues are addressed now: No, they're not. > Better cross-VCS integration of smerge mode would be nice but is not a > git-vs-bzr issue It is. I want my workflow to work about as well as before. I can live with the lack of true lightweight checkouts, but manual conflict resolution is something I do every day, so it needs to work well. There's plenty of time to address this before the 24.4 release and hence before the switch over. > 0. Before changeover, we prepare a shellscript that creates annotated > cryptosigned tags for the historical versions. (This will require > Stefan to create an "Emacs maintainer" GPG identity if none exists.) [...] > 6. Stefan applies the script to make cryptosigned historical release tags. I'd rather delegate those. Stefan