From: Bastien <bzg@gnu.org>
To: Eli Zaretskii <eliz@gnu.org>
Cc: emacs-devel@gnu.org
Subject: Re: patch vs. overwrite in bzr [was: Next pretest, and regressions policy]
Date: Wed, 11 Apr 2012 16:36:40 +0200 [thread overview]
Message-ID: <87bomytjwn.fsf@altern.org> (raw)
In-Reply-To: <83zkaqb2fc.fsf@gnu.org> (Eli Zaretskii's message of "Thu, 05 Apr 2012 18:53:27 +0300")
Hi Eli,
Eli Zaretskii <eliz@gnu.org> writes:
> Well, I'm not sure I get all the details of your setup, so it's
> possible that I will say something silly; apologies in advance. But
> IIUC, you could get away with less branches and less manual work. So
> here we go:
Thanks a lot for the detailed workflow description.
I don't have the bzr-tiplog plugin installed (I don't know how to
install it), and just by reading the workflow I don't feel really
confortable in trying it...
Here is the one I used for the sync this morning:
~$ cd install/git/
~$ git clone git://git.savannah.gnu.org/emacs.git
~$ cd emacs
~$ git checkout emacs-24
~$ cd ~/install/git/org-mode/
~$ git checkout maint [the branch in sync with Emacs]
~$ cp [files from Emacs] [to files from Org]
~$ git diff > ~/emacs-sync.diff
~$ [review the diff and apply it to the maint branch]
~$ git checkout hotfix
~$ git merge maint [merge changes from Emacs]
~$ [release new Org (minor) version]
~$ git checkout maint
~$ git merge hotfix
~$ copy files from Org to Emacs (git)
~$ git diff [in Emacs git, to get the diff]
~$ review the patch and apply it to bzr emacs-24 if correct
Most of this can be automated with a few scripts, and I
try to avoid bzr, because using Magit for git diff and other
operations is really handy.
Best,
--
Bastien
next prev parent reply other threads:[~2012-04-11 14:36 UTC|newest]
Thread overview: 85+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-22 13:28 Next pretest, and regressions policy Chong Yidong
2012-03-31 10:15 ` Bastien
2012-04-01 9:55 ` Bastien
2012-04-01 12:37 ` =?utf-8?Q?=C3=93scar_Fuentes?=
2012-04-01 13:30 ` Stefan Monnier
2012-04-01 17:09 ` Chong Yidong
2012-04-01 20:32 ` Bastien
2012-04-02 4:12 ` Chong Yidong
2012-04-01 20:32 ` Bastien
2012-04-03 8:20 ` patch vs. overwrite in bzr [was: Next pretest, and regressions policy] Roland Winkler
2012-04-03 12:36 ` Óscar Fuentes
2012-04-03 13:42 ` Bastien
2012-04-03 15:02 ` patch vs. overwrite in bzr =?utf-8?Q?=C3=93scar_Fuentes?=
2012-04-03 15:03 ` David Engster
2012-04-03 16:31 ` Stefan Monnier
2012-04-03 17:40 ` Michael Albinus
2012-04-03 15:32 ` patch vs. overwrite in bzr [was: Next pretest, and regressions policy] Stefan Monnier
2012-04-03 16:52 ` patch vs. overwrite in bzr Glenn Morris
2012-04-03 20:50 ` Bastien
2012-04-03 21:27 ` Glenn Morris
2012-04-04 0:26 ` Stefan Monnier
2012-04-04 5:45 ` Bastien
2012-04-04 5:51 ` Bastien
2012-04-04 6:46 ` Michael Albinus
2012-04-04 8:35 ` Thierry Volpiatto
2012-04-04 13:20 ` Stefan Monnier
2012-04-04 16:39 ` Jordi Gutiérrez Hermoso
2012-04-04 16:52 ` Paul Eggert
2012-04-04 17:09 ` Eli Zaretskii
2012-04-04 17:53 ` Thierry Volpiatto
2012-04-04 19:07 ` Eli Zaretskii
2012-04-04 19:38 ` Thierry Volpiatto
2012-04-04 20:12 ` Eli Zaretskii
2012-04-04 13:16 ` Stefan Monnier
2012-04-04 17:01 ` Eli Zaretskii
2012-04-04 18:07 ` Stefan Monnier
2012-04-04 19:11 ` Eli Zaretskii
2012-04-04 20:11 ` David Engster
2012-04-04 22:06 ` Stefan Monnier
2012-04-05 3:09 ` Eli Zaretskii
2012-04-05 13:22 ` Stefan Monnier
2012-04-05 15:24 ` Lars Magne Ingebrigtsen
2012-04-05 15:57 ` Eli Zaretskii
2012-04-05 17:10 ` Ted Zlatanov
2012-04-06 7:13 ` Richard Stallman
2012-04-06 8:29 ` Bastien
2012-04-06 8:40 ` Eli Zaretskii
2012-04-06 9:20 ` Bastien
2012-04-06 9:57 ` Eli Zaretskii
2012-04-06 10:20 ` Bastien
2012-04-06 17:26 ` chad
2012-04-06 20:01 ` joakim
2012-04-06 20:52 ` Eli Zaretskii
2012-04-07 2:28 ` Óscar Fuentes
2012-04-07 6:33 ` Eli Zaretskii
2012-04-07 11:56 ` Óscar Fuentes
2012-04-07 12:10 ` Eli Zaretskii
2012-04-07 12:56 ` Óscar Fuentes
2012-04-07 13:32 ` Eli Zaretskii
2012-04-07 13:42 ` Óscar Fuentes
2012-04-07 7:07 ` Andreas Schwab
2012-04-07 11:44 ` Óscar Fuentes
2012-04-06 21:10 ` Juanma Barranquero
2012-04-16 10:45 ` Jason Rumney
2012-04-16 16:38 ` Eli Zaretskii
2012-04-06 16:17 ` Christophe Poncy
2012-04-06 16:41 ` Eli Zaretskii
2012-04-06 17:14 ` Christophe Poncy
2012-04-07 0:17 ` Richard Stallman
2012-04-07 0:17 ` Richard Stallman
2012-04-07 9:15 ` Bastien
2012-04-07 22:19 ` Richard Stallman
2012-04-09 9:39 ` Bastien
2012-04-08 3:25 ` Richard Stallman
2012-04-08 15:52 ` Ted Zlatanov
2012-04-16 22:02 ` Richard Stallman
2012-04-06 8:43 ` Eli Zaretskii
2012-04-04 17:12 ` patch vs. overwrite in bzr [was: Next pretest, and regressions policy] Eli Zaretskii
2012-04-05 7:13 ` Bastien
2012-04-05 15:53 ` Eli Zaretskii
2012-04-11 14:36 ` Bastien [this message]
2012-04-04 18:01 ` Thierry Volpiatto
2012-04-05 7:19 ` Bastien
2012-04-05 9:16 ` Thierry Volpiatto
2012-04-01 20:35 ` Next pretest, and regressions policy Bastien
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=87bomytjwn.fsf@altern.org \
--to=bzg@gnu.org \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
/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).