| Message ID | 4D505820.90507@discworld.dascon.de |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Tue, Feb 8, 2011 at 7:37 AM, Michael Schwingen <rincewind@discworld.dascon.de> wrote: > Am 02/05/2011 12:52 AM, schrieb Wolfgang Denk: >> Dear Michael Schwingen, >> >> In message <1296860763-16149-1-git-send-email-michael@schwingen.org> you wrote: >>> here is the third incarnation of the IXP patch series. I hope I addressed >>> all the comments from version 2: >>> - timer system now uses no BSS-based variables >>> - use I/O accessors >>> - remove config.mk from board directories >>> - set -ffunction-sections/--gc-sections globally (for IXP architecture) >> Sorry, but please consider it all NAKed. >> >> See the note at bullet 2 at >> http://www.denx.de/wiki/view/U-Boot/Patches#Sending_updated_patch_versions >> for the rationale. > Hi, > > I just tried, but I can't find a way to insert the changelog so that > git-send-email places it at the required point (ie. after the s.o.b. and > inside the same comment block as the diffstat) - all I could get was the > changelog inside the comment block, with a line with "---" above, like this: > > From: Michael Schwingen <michael@schwingen.org> > Date: Fri, 4 Feb 2011 21:34:59 +0100 > Subject: [PATCH 01/17] add XScale sub architecture (IXP/PXA) to > maintainer list > > --- > Changes for V2: > Changes for V3: > - change patch description > - drop wepep250 (should already be deleted) > Changes for V4: > - add changelog > > Signed-off-by: Michael Schwingen <michael@schwingen.org> > --- > MAINTAINERS | 44 ++++++++++++++++++++++---------------------- > 1 files changed, 22 insertions(+), 22 deletions(-) > > diff --git a/MAINTAINERS b/MAINTAINERS > index b37ed0c..709c5d9 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -559,8 +559,8 @@ Stefano Babic <sbabic@denx.de> > > which looks quite different from what the wiki suggests. > > Do you have a short pointer how to get the right result using git? Or is > this format actually acceptable? > I use git-format-patch to dump the patches into a directory and then tweak the comment section manually before using git-send-email. I can also run diff against any two versions of the series, checkpatch etc Maybe there is a more integrated way, but I'm a creature of habit - once I find something that works for me, I tend to stick to it :) Regards, Graeme
Am 02/07/2011 09:54 PM, schrieb Graeme Russ: > On Tue, Feb 8, 2011 at 7:37 AM, Michael Schwingen > <rincewind@discworld.dascon.de> wrote: >> Am 02/05/2011 12:52 AM, schrieb Wolfgang Denk: >>> Dear Michael Schwingen, >>> >>> In message <1296860763-16149-1-git-send-email-michael@schwingen.org> you wrote: >>>> here is the third incarnation of the IXP patch series. I hope I addressed >>>> all the comments from version 2: >>>> - timer system now uses no BSS-based variables >>>> - use I/O accessors >>>> - remove config.mk from board directories >>>> - set -ffunction-sections/--gc-sections globally (for IXP architecture) >>> Sorry, but please consider it all NAKed. >>> >>> See the note at bullet 2 at >>> http://www.denx.de/wiki/view/U-Boot/Patches#Sending_updated_patch_versions >>> for the rationale. >> Hi, >> >> I just tried, but I can't find a way to insert the changelog so that >> git-send-email places it at the required point (ie. after the s.o.b. and >> inside the same comment block as the diffstat) - all I could get was the >> changelog inside the comment block, with a line with "---" above, like this: >> >> From: Michael Schwingen <michael@schwingen.org> >> Date: Fri, 4 Feb 2011 21:34:59 +0100 >> Subject: [PATCH 01/17] add XScale sub architecture (IXP/PXA) to >> maintainer list >> >> --- >> Changes for V2: >> Changes for V3: >> - change patch description >> - drop wepep250 (should already be deleted) >> Changes for V4: >> - add changelog >> >> Signed-off-by: Michael Schwingen <michael@schwingen.org> >> --- >> MAINTAINERS | 44 ++++++++++++++++++++++---------------------- >> 1 files changed, 22 insertions(+), 22 deletions(-) >> >> diff --git a/MAINTAINERS b/MAINTAINERS >> index b37ed0c..709c5d9 100644 >> --- a/MAINTAINERS >> +++ b/MAINTAINERS >> @@ -559,8 +559,8 @@ Stefano Babic <sbabic@denx.de> >> >> which looks quite different from what the wiki suggests. >> >> Do you have a short pointer how to get the right result using git? Or is >> this format actually acceptable? >> > I use git-format-patch to dump the patches into a directory and then tweak > the comment section manually before using git-send-email. I can also run > diff against any two versions of the series, checkpatch etc > > Maybe there is a more integrated way, but I'm a creature of habit - once I > find something that works for me, I tend to stick to it :) manually editing the changelog in 17 files for every patch version does not sound very manageable. Is there really no way to generate/maintain the changelogs using git? cu Michael
On Mon, Feb 14, 2011 at 4:03 AM, Michael Schwingen <rincewind@discworld.dascon.de> wrote: > Am 02/07/2011 09:54 PM, schrieb Graeme Russ: >> On Tue, Feb 8, 2011 at 7:37 AM, Michael Schwingen >> <rincewind@discworld.dascon.de> wrote: >>> Am 02/05/2011 12:52 AM, schrieb Wolfgang Denk: >>>> Dear Michael Schwingen, >>>> >>>> In message <1296860763-16149-1-git-send-email-michael@schwingen.org> you wrote: >>>>> here is the third incarnation of the IXP patch series. I hope I addressed >>>>> all the comments from version 2: >>>>> - timer system now uses no BSS-based variables >>>>> - use I/O accessors >>>>> - remove config.mk from board directories >>>>> - set -ffunction-sections/--gc-sections globally (for IXP architecture) >>>> Sorry, but please consider it all NAKed. >>>> >>>> See the note at bullet 2 at >>>> http://www.denx.de/wiki/view/U-Boot/Patches#Sending_updated_patch_versions >>>> for the rationale. >>> Hi, >>> >>> I just tried, but I can't find a way to insert the changelog so that >>> git-send-email places it at the required point (ie. after the s.o.b. and >>> inside the same comment block as the diffstat) - all I could get was the >>> changelog inside the comment block, with a line with "---" above, like this: >>> >>> From: Michael Schwingen <michael@schwingen.org> >>> Date: Fri, 4 Feb 2011 21:34:59 +0100 >>> Subject: [PATCH 01/17] add XScale sub architecture (IXP/PXA) to >>> maintainer list >>> >>> --- >>> Changes for V2: >>> Changes for V3: >>> - change patch description >>> - drop wepep250 (should already be deleted) >>> Changes for V4: >>> - add changelog >>> >>> Signed-off-by: Michael Schwingen <michael@schwingen.org> >>> --- >>> MAINTAINERS | 44 ++++++++++++++++++++++---------------------- >>> 1 files changed, 22 insertions(+), 22 deletions(-) >>> >>> diff --git a/MAINTAINERS b/MAINTAINERS >>> index b37ed0c..709c5d9 100644 >>> --- a/MAINTAINERS >>> +++ b/MAINTAINERS >>> @@ -559,8 +559,8 @@ Stefano Babic <sbabic@denx.de> >>> >>> which looks quite different from what the wiki suggests. >>> >>> Do you have a short pointer how to get the right result using git? Or is >>> this format actually acceptable? >>> >> I use git-format-patch to dump the patches into a directory and then tweak >> the comment section manually before using git-send-email. I can also run >> diff against any two versions of the series, checkpatch etc >> >> Maybe there is a more integrated way, but I'm a creature of habit - once I >> find something that works for me, I tend to stick to it :) > manually editing the changelog in 17 files for every patch version does > not sound very manageable. Is there really no way to generate/maintain > the changelogs using git? > For multi-patch series, you only need to put the revision history in the [00/nn] file - No need to individually annotate each and every patch Regards, Graeme
Dear Graeme Russ, In message <AANLkTikxv+ATsYAP5ismLo5pj=TrFV_oQNk=8qVh1tDH@mail.gmail.com> you wrote: > > For multi-patch series, you only need to put the revision history in the > [00/nn] file - No need to individually annotate each and every patch This is *wrong*. See the Note at bullet 2 at http://www.denx.de/wiki/view/U-Boot/Patches#Sending_updated_patch_versions Best regards, Wolfgang Denk
On Mon, Feb 14, 2011 at 9:03 AM, Wolfgang Denk <wd@denx.de> wrote: > Dear Graeme Russ, > > In message <AANLkTikxv+ATsYAP5ismLo5pj=TrFV_oQNk=8qVh1tDH@mail.gmail.com> you wrote: >> >> For multi-patch series, you only need to put the revision history in the >> [00/nn] file - No need to individually annotate each and every patch > > This is *wrong*. > > See the Note at bullet 2 at > http://www.denx.de/wiki/view/U-Boot/Patches#Sending_updated_patch_versions > Oops - Thanks for the correction :) Regards, Graeme
Am 02/13/2011 11:03 PM, schrieb Wolfgang Denk: > Dear Graeme Russ, > > In message <AANLkTikxv+ATsYAP5ismLo5pj=TrFV_oQNk=8qVh1tDH@mail.gmail.com> you wrote: >> For multi-patch series, you only need to put the revision history in the >> [00/nn] file - No need to individually annotate each and every patch > This is *wrong*. > > See the Note at bullet 2 at > http://www.denx.de/wiki/view/U-Boot/Patches#Sending_updated_patch_versions Do you have any advise *how* to do that using git? Any pointer is fine, I can RTFM if I know where to start. cu Michael
Le 14/02/2011 00:38, Michael Schwingen a écrit : > Am 02/13/2011 11:03 PM, schrieb Wolfgang Denk: >> Dear Graeme Russ, >> >> In message<AANLkTikxv+ATsYAP5ismLo5pj=TrFV_oQNk=8qVh1tDH@mail.gmail.com> you wrote: >>> For multi-patch series, you only need to put the revision history in the >>> [00/nn] file - No need to individually annotate each and every patch >> This is *wrong*. >> >> See the Note at bullet 2 at >> http://www.denx.de/wiki/view/U-Boot/Patches#Sending_updated_patch_versions (I plead guilty, then. I, too, did put patchset history only in the summary post, and never commented others who did it too) > Do you have any advise *how* to do that using git? > > Any pointer is fine, I can RTFM if I know where to start. Git itself won't give you a way to do this. What I do is: - when I create a V2 patchset I edit the patch messages manually to add history (in the summary so far, I'll fix this for future patchsets) and keep the patch messages around; - when I create a V3-or-later patchset, I copy-paste the history from the previous set then add the new history entry. Being a creature of habit, I am used to launching two instances of nedit with the V(n-1) and V(n) patch sets for this. > cu > Michael Amicalement,
Am 02/14/2011 01:00 PM, schrieb Albert ARIBAUD: > Le 14/02/2011 00:38, Michael Schwingen a écrit : >> Am 02/13/2011 11:03 PM, schrieb Wolfgang Denk: >>> Dear Graeme Russ, >>> >>> In message<AANLkTikxv+ATsYAP5ismLo5pj=TrFV_oQNk=8qVh1tDH@mail.gmail.com> you wrote: >>>> For multi-patch series, you only need to put the revision history in the >>>> [00/nn] file - No need to individually annotate each and every patch >>> This is *wrong*. >>> >>> See the Note at bullet 2 at >>> http://www.denx.de/wiki/view/U-Boot/Patches#Sending_updated_patch_versions > (I plead guilty, then. I, too, did put patchset history only in the > summary post, and never commented others who did it too) > >> Do you have any advise *how* to do that using git? >> >> Any pointer is fine, I can RTFM if I know where to start. > Git itself won't give you a way to do this. What I do is: > > - when I create a V2 patchset I edit the patch messages manually to add > history (in the summary so far, I'll fix this for future patchsets) and > keep the patch messages around; > > - when I create a V3-or-later patchset, I copy-paste the history from > the previous set then add the new history entry. > > Being a creature of habit, I am used to launching two instances of nedit > with the V(n-1) and V(n) patch sets for this. So in my case, I would need 2*17 editor instances (or more likely 17 sessions with 2 editor instances each), for each patch version. That add quite a lot of work just to prepare otherwise working patches for patchwork. I will see when I find time to re-do the patch series that way, however, I need to say that maintaining patches out-of-tree seems less work than getting the patches into mainline using this procedure. cu Michael
Am 02/14/2011 01:00 PM, schrieb Albert ARIBAUD: > Le 14/02/2011 00:38, Michael Schwingen a écrit : >> Am 02/13/2011 11:03 PM, schrieb Wolfgang Denk: >>> Dear Graeme Russ, >>> >>> In message<AANLkTikxv+ATsYAP5ismLo5pj=TrFV_oQNk=8qVh1tDH@mail.gmail.com> you wrote: >>>> For multi-patch series, you only need to put the revision history in the >>>> [00/nn] file - No need to individually annotate each and every patch >>> This is *wrong*. >>> >>> See the Note at bullet 2 at >>> http://www.denx.de/wiki/view/U-Boot/Patches#Sending_updated_patch_versions > (I plead guilty, then. I, too, did put patchset history only in the > summary post, and never commented others who did it too) You are probably not guilty - that requirement only appeared in the Wiki page on 11 Jan 2011, in an edit by Wolfgang Denk: http://www.denx.de/wiki/rdiff/U-Boot/Patches?rev2=1.28&rev1=1.29 cu Michael
diff --git a/MAINTAINERS b/MAINTAINERS index b37ed0c..709c5d9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -559,8 +559,8 @@ Stefano Babic <sbabic@denx.de> which looks quite different from what the wiki suggests. Do you have a short pointer how to get the right result using git? Or is this format actually acceptable? thanks, Michael