From: Tom Tromey <tromey@redhat.com>
To: "Pierre Muller" <pierre.muller@ics-cnrs.unistra.fr>
Cc: "'Joel Brobecker'" <brobecker@adacore.com>, <archer@sourceware.org>
Subject: Re: [Archer] Re: [Archer] Archer git account inquiry
Date: Wed, 23 Feb 2011 20:21:00 -0000 [thread overview]
Message-ID: <m3lj16ijsv.fsf@fleche.redhat.com> (raw)
In-Reply-To: <000f01cbd339$32d6b6c0$98842440$@muller@ics-cnrs.unistra.fr> (Pierre Muller's message of "Wed, 23 Feb 2011 10:08:12 +0100")
Pierre> I don't really care about where I put my modifications,
Pierre> if nobody is against it, archer repository is fine with me.
It is perfectly ok.
Pierre> Related question: should I change the wiki page
Pierre> to add my branch? Do I need to logon somewhere for this?
Yes, please document new branches on the wiki.
You need an account on the wiki, you can make one there somehow.
Pierre> Coming back to the primary reason of my request for git account:
Pierre> I am mainly interested in an easier way to split
Pierre> larges patches into several sub-patches like many of you
Pierre> are doing.
Pierre> So my main question is:
Pierre> what do you use to create your email series with sub-patches?
Pierre> -- git alone?
Pierre> or stgit, guilt or Quilt?
I write my patches willy-nilly, in the craziest style imaginable.
This is usually what I push to the public repository as well.
For submissions, I make a new private branch and extract bits from the
development branch in various ways -- sometimes cherry-picking,
sometimes patches -- and use git rebase to make a patch series. For
this, the "Perfect Patch Series" instructions in the git manual are
ideal, I just follow them exactly.
After this, if I need to rework the patches, I just do it on my local
branch, this time rebasing, etc, to keep the patches clean.
Pierre> How do you handle ChangeLog entries for instance?
Pierre> do you really put them into the commits, but then
Pierre> they would appear formatted as a diff in the patch also
Pierre> or do you have special scripts for this?
Usually I ignore them until the point of patch submission, because they
are such a pain to deal with.
On occasion I have written my ChangeLog entries during the rebase
process, then just used them as the commit messages in git. Then if I
need to rework the patch series, I also update the commit messages as I
go.
I don't usually modify my branch ChangeLog files since it is just a
pain. It makes random conflicts if I rebase (there are some tools to
help with this, but I haven't bothered yet), and on the development
branch I often rework things, so just accumulating the ChangeLog entries
would yield the wrong result for the upstream submission anyhow.
Tom
next prev parent reply other threads:[~2011-02-23 20:21 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-21 13:27 Pierre Muller
2011-02-21 14:22 ` [Archer] " Joel Brobecker
2011-02-21 14:34 ` Tom Tromey
2011-02-22 4:25 ` [Archer] " Joel Brobecker
2011-02-23 3:30 ` Joel Brobecker
2011-02-23 9:08 ` Pierre Muller
2011-02-23 9:19 ` [Archer] " Joel Brobecker
2011-02-23 20:21 ` Tom Tromey [this message]
2011-02-24 11:01 ` Jan Kratochvil
2011-02-24 11:11 ` Pierre Muller
2011-02-24 11:20 ` Pierre Muller
2011-02-24 11:29 ` Jan Kratochvil
2011-02-23 20:23 ` Tom Tromey
2011-02-24 3:22 ` [Archer] " Joel Brobecker
2011-02-21 14:31 ` Tom Tromey
2011-02-24 11:05 ` Pierre Muller
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=m3lj16ijsv.fsf@fleche.redhat.com \
--to=tromey@redhat.com \
--cc=archer@sourceware.org \
--cc=brobecker@adacore.com \
--cc=pierre.muller@ics-cnrs.unistra.fr \
/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.
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).