unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Giuseppe Scrivano <gscrivano@gnu.org>
To: John Wiegley <jwiegley@gmail.com>
Cc: emacs-devel@gnu.org
Subject: Re: Using Git to manage your Emacs changes
Date: Wed, 07 Apr 2010 22:53:58 +0200	[thread overview]
Message-ID: <87eiir3rx5.fsf@master.homenet> (raw)
In-Reply-To: <EED641D7-1934-4149-BB4C-C4071C7FB193@gmail.com> (John Wiegley's message of "Wed, 7 Apr 2010 15:23:13 -0400")

I have some notes on your script:

John Wiegley <jwiegley@gmail.com> writes:

> git checkout ${1:-upstream}
> git format-patch ..master
>
> for i in [0-9]*.patch; do
>         echo Applying $i
>
>         patch -p1 < $i

I am not sure the script handles added and removed files, probably you
must explicitly call bzr add|rm.



>         grep ^Subject: $i | sed 's/^Subject: \[PATCH\] //' > /tmp/msg.$$
>
>         perl -ne 'print if /^$/ .. /^---/;' $i | \
>           perl -ne 'print unless /^---/ .. eof()' | \
>           tail +2 >> /tmp/msg.$$

tail -n +2



>         bzr commit -F /tmp/msg.$$

I think it is desiderable to keep the original author and commit time as
well.


Cheers,
Giuseppe





  parent reply	other threads:[~2010-04-07 20:53 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-04-07 19:23 Using Git to manage your Emacs changes John Wiegley
2010-04-07 19:32 ` David Reitter
2010-04-07 20:25   ` John Wiegley
2010-04-07 21:22     ` David Reitter
2010-04-21 17:30   ` Ted Zlatanov
2010-04-21 18:12     ` David Reitter
2010-04-21 19:29       ` John Wiegley
2010-04-21 20:42         ` Eli Zaretskii
2010-04-22  7:17           ` John Wiegley
2010-04-22  9:41             ` Lennart Borgman
2010-04-22 10:28               ` Andreas Schwab
2010-04-22 11:09                 ` Lennart Borgman
2010-04-22 11:29                   ` Andreas Schwab
2010-04-22 16:20                     ` endless version control debates [was Re: Using Git to manage your Emacs changes] Glenn Morris
2010-04-22 17:02                       ` endless version control debates Óscar Fuentes
2010-04-22 17:07                       ` endless version control debates [was Re: Using Git to manage your Emacs changes] Leo
2010-04-22 17:52                         ` Chad Brown
2010-04-22 19:16                           ` Andreas Schwab
2010-04-22 20:09                             ` Chad Brown
2010-04-23  2:50                               ` endless version control debates Miles Bader
2010-04-22 20:16                           ` endless version control debates [was Re: Using Git to manage your Emacs changes] Leo
2010-04-22 20:46                             ` Eli Zaretskii
2010-04-22 21:10                             ` Jeff Clough
2010-04-22 10:40               ` Using Git to manage your Emacs changes Miles Bader
2010-04-23  8:38                 ` Juri Linkov
2010-04-23  9:29                   ` Ævar Arnfjörð Bjarmason
2010-04-24 13:20                   ` Richard Stallman
2010-04-24 15:27                     ` Jason Earl
2010-04-24 15:45                       ` Ævar Arnfjörð Bjarmason
2010-04-24 17:10                       ` Alfred M. Szmidt
2010-04-24 19:33                         ` Jason Earl
2010-04-24 20:33                           ` Alfred M. Szmidt
2010-04-24 20:36                           ` Eli Zaretskii
2010-04-24 21:54                             ` Jason Earl
2010-04-25  8:26                             ` Stephen J. Turnbull
2010-04-27 20:59                             ` Karl Fogel
2010-04-25 16:47                           ` Georg Brandl
2010-04-26 14:33                       ` Richard Stallman
2010-04-26 17:35                         ` Eli Zaretskii
2010-04-21 22:16         ` Andreas Schwab
2010-04-07 20:53 ` Giuseppe Scrivano [this message]
2010-04-07 20:37   ` Thierry Volpiatto
2010-04-08 22:27     ` John Wiegley
2010-04-08 22:43       ` Jonas Bernoulli
2010-04-09  6:04       ` Thierry Volpiatto
2010-04-08 16:57 ` Ken Raeburn

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

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87eiir3rx5.fsf@master.homenet \
    --to=gscrivano@gnu.org \
    --cc=emacs-devel@gnu.org \
    --cc=jwiegley@gmail.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 public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).