From: Stefan Monnier <monnier@iro.umontreal.ca>
To: esr@thyrsus.com (Eric S. Raymond)
Cc: emacs-devel@gnu.org
Subject: Re: Git transition checklist
Date: Wed, 08 Jan 2014 09:59:53 -0500 [thread overview]
Message-ID: <jwvd2k2ledv.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <20140108135200.8ECF9380834@snark.thyrsus.com> (Eric S. Raymond's message of "Wed, 8 Jan 2014 08:52:00 -0500 (EST)")
> 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
next prev parent reply other threads:[~2014-01-08 14:59 UTC|newest]
Thread overview: 132+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-08 13:52 Git transition checklist Eric S. Raymond
2014-01-08 14:59 ` Stefan Monnier [this message]
2014-01-08 16:35 ` Rüdiger Sonderfeld
2014-01-08 17:12 ` Stefan Monnier
2014-01-08 18:08 ` Rüdiger Sonderfeld
2014-01-08 18:21 ` Improved git commit emails [was Re: Git transition checklist] Glenn Morris
2014-01-08 18:31 ` Ted Zlatanov
2014-01-08 18:37 ` Improved git commit emails Glenn Morris
2014-01-08 21:04 ` Ted Zlatanov
2014-01-12 5:44 ` Bob Proulx
2014-01-13 2:22 ` Glenn Morris
2014-01-15 2:10 ` Bob Proulx
2014-01-15 7:35 ` Glenn Morris
2014-01-20 1:09 ` Bob Proulx
2014-01-20 2:16 ` Stephen J. Turnbull
2014-01-20 4:27 ` Bob Proulx
2014-01-22 19:20 ` Glenn Morris
2014-01-23 18:42 ` Rüdiger Sonderfeld
2014-01-28 23:45 ` Bob Proulx
2014-01-29 0:57 ` Glenn Morris
2014-01-31 0:41 ` Bob Proulx
2014-01-08 16:48 ` Git transition checklist Eric S. Raymond
2014-01-08 17:19 ` Stefan Monnier
2014-01-08 18:43 ` Andreas Schwab
2014-01-08 19:02 ` Glenn Morris
2014-01-08 19:07 ` Eric S. Raymond
2014-01-08 19:17 ` Eric S. Raymond
2014-01-08 17:49 ` Glenn Morris
2014-01-08 18:02 ` Eli Zaretskii
2014-01-08 18:17 ` David Engster
2014-01-08 18:36 ` Eli Zaretskii
2014-01-08 19:07 ` Andreas Schwab
2014-01-08 19:16 ` David Engster
2014-01-08 18:41 ` Andreas Schwab
2014-01-08 18:48 ` Eli Zaretskii
2014-01-08 19:19 ` Andreas Schwab
2014-01-08 15:02 ` Stephen Berman
2014-01-08 16:26 ` Eric S. Raymond
2014-01-08 16:37 ` Git repack on Savannah [was: Re: Git transition checklist] James Cloos
2014-01-12 6:11 ` Bob Proulx
2014-01-12 15:59 ` Eli Zaretskii
2014-01-08 15:33 ` Git transition checklist Bastien
2014-01-08 16:19 ` Eric S. Raymond
2014-01-08 16:20 ` Bastien
2014-01-08 17:48 ` Glenn Morris
2014-01-08 18:15 ` Dani Moncayo
2014-01-08 18:22 ` Glenn Morris
2014-01-08 18:23 ` Andreas Schwab
2014-01-08 18:26 ` Glenn Morris
2014-01-08 18:50 ` Stefan Monnier
2014-01-08 19:00 ` Glenn Morris
2014-01-08 19:41 ` Stefan Monnier
2014-01-08 19:11 ` Andreas Schwab
2014-01-08 19:16 ` Glenn Morris
2014-01-08 19:46 ` Stefan Monnier
2014-01-08 23:07 ` Dani Moncayo
2014-01-12 20:15 ` Bob Proulx
2014-01-13 10:50 ` Bastien
2014-01-08 15:34 ` Bastien
2014-01-08 16:13 ` Eric S. Raymond
2014-01-08 17:47 ` Glenn Morris
2014-01-08 20:02 ` Eric S. Raymond
2014-01-08 20:19 ` Eli Zaretskii
2014-01-08 21:10 ` Andreas Schwab
2014-01-09 0:54 ` James Cloos
2014-01-09 1:23 ` Rüdiger Sonderfeld
2014-01-09 6:38 ` Eli Zaretskii
2014-01-09 0:51 ` James Cloos
2014-01-09 1:36 ` Rüdiger Sonderfeld
2014-01-09 1:48 ` Rüdiger Sonderfeld
2014-01-09 6:41 ` Eli Zaretskii
2014-01-09 11:10 ` Andreas Schwab
2014-01-09 16:17 ` Eli Zaretskii
2014-01-09 16:45 ` Rüdiger Sonderfeld
2014-01-09 17:44 ` Eli Zaretskii
2014-01-09 11:53 ` Rüdiger Sonderfeld
2014-01-09 1:53 ` Glenn Morris
2014-01-09 2:13 ` Glenn Morris
2014-01-09 12:14 ` Eric S. Raymond
2014-01-09 14:55 ` Paul Eggert
2014-01-09 15:15 ` Eric S. Raymond
2014-01-09 15:24 ` Juanma Barranquero
2014-01-09 16:45 ` Eric S. Raymond
2014-01-09 2:12 ` Glenn Morris
2014-01-09 4:27 ` Stephen J. Turnbull
2014-01-09 7:05 ` Eli Zaretskii
2014-01-09 8:14 ` Stephen J. Turnbull
2014-01-09 11:22 ` Andreas Schwab
2014-01-09 14:30 ` Stephen J. Turnbull
2014-01-09 14:58 ` David Kastrup
2014-01-09 16:58 ` Eli Zaretskii
2014-01-09 18:46 ` Stephen J. Turnbull
2014-01-09 19:03 ` Eli Zaretskii
2014-01-09 19:40 ` Óscar Fuentes
2014-01-09 19:47 ` Eli Zaretskii
2014-01-09 20:12 ` Óscar Fuentes
2014-01-09 20:17 ` Glenn Morris
2014-01-09 20:29 ` Eli Zaretskii
2014-01-09 21:49 ` Óscar Fuentes
2014-01-10 6:38 ` Eli Zaretskii
2014-01-11 9:14 ` Eli Zaretskii
2014-01-11 20:09 ` Glenn Morris
2014-01-11 20:32 ` David Kastrup
2014-01-12 10:30 ` Jorgen Schaefer
2014-01-13 22:34 ` Barry Warsaw
2014-01-13 17:06 ` Glenn Morris
2014-01-13 17:50 ` David Kastrup
2014-01-14 17:05 ` Richard Stallman
2014-01-09 15:12 ` Stefan Monnier
2014-01-09 15:33 ` Andreas Schwab
2014-01-08 18:14 ` Eli Zaretskii
2014-01-08 18:29 ` Glenn Morris
2014-01-08 18:39 ` Eli Zaretskii
2014-01-08 18:46 ` Eli Zaretskii
2014-01-08 20:17 ` David Kastrup
2014-01-08 19:03 ` Andreas Schwab
2014-01-08 18:45 ` Achim Gratz
2014-01-08 18:52 ` Eli Zaretskii
2014-01-08 19:15 ` Achim Gratz
2014-01-08 19:00 ` Andreas Schwab
2014-01-08 20:11 ` Eric S. Raymond
2014-01-08 20:22 ` Eli Zaretskii
2014-01-08 20:28 ` Eric S. Raymond
2014-01-08 21:04 ` Eli Zaretskii
2014-01-08 21:26 ` Eric S. Raymond
2014-01-09 6:25 ` Eli Zaretskii
2014-01-08 21:47 ` David Kastrup
2014-01-08 20:52 ` Eli Zaretskii
2014-01-08 21:07 ` Stefan Monnier
2014-01-08 21:22 ` Eli Zaretskii
-- strict thread matches above, loose matches on Subject: below --
2014-01-14 17:42 Angelo Graziosi
2014-01-15 12:29 ` Richard Stallman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=jwvd2k2ledv.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=emacs-devel@gnu.org \
--cc=esr@thyrsus.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.