| 1 |
On Fri, 18 Apr 2014 12:26:13 -0700 |
| 2 |
Pavel Kazakov <nullishzero@g.o> wrote: |
| 3 |
|
| 4 |
> On 04/11/2014 04:03 PM, Brian Dolbec wrote: |
| 5 |
> > On Fri, 11 Apr 2014 15:05:09 -0700 |
| 6 |
> > Pavel Kazakov <nullishzero@g.o> wrote: |
| 7 |
> > |
| 8 |
> >> On 03/31/2014 12:00 AM, Alexander Berntsen wrote: |
| 9 |
> >>> On 31/03/14 04:06, Brian Dolbec wrote: |
| 10 |
> >>>> It all looked really good to me. {:-D |
| 11 |
> >>> Yep. |
| 12 |
> >>> |
| 13 |
> >>> Please update the commit messages to follow DEVELOPING though. |
| 14 |
> >>> |
| 15 |
> >> |
| 16 |
> >> Sure. How are the following updates? |
| 17 |
> >> |
| 18 |
> >> For the first patch, I'll remove the second message line so the |
| 19 |
> >> message is only: |
| 20 |
> >> Move -MERGING- string to a constant |
| 21 |
> >> |
| 22 |
> >> |
| 23 |
> > |
| 24 |
> > No, there is never suppose to be more than a blank line for the |
| 25 |
> > second line. Then for lines 3+ fill your boots :) |
| 26 |
> > |
| 27 |
> > the idea is to have one short descriptive line, followed by a blank |
| 28 |
> > line, then as many detail lines as needed. |
| 29 |
> > |
| 30 |
> > So, in this case dropping out the whitespace changes is minor, but |
| 31 |
> > still relevant. so it should be kept on line 3. |
| 32 |
> > |
| 33 |
> > |
| 34 |
> >> For the second patch, I'll update the message to: |
| 35 |
> >> Add emaint module that handles failed merges |
| 36 |
> >> |
| 37 |
> >> The emaint module can scan for failed merges and fix any failed |
| 38 |
> >> merges found. The emaint module also keeps track of failed merges |
| 39 |
> >> using a tracking file. |
| 40 |
> >> |
| 41 |
> >> Regards, |
| 42 |
> >> Pavel |
| 43 |
> >> |
| 44 |
> > |
| 45 |
> > I was thinking more along the lines of: |
| 46 |
> > |
| 47 |
> > New emaint module: Merges |
| 48 |
> > |
| 49 |
> > This emaint module scans for failed package merges and will display |
| 50 |
> > or fix any failed packages found. |
| 51 |
> > This module also saves failed merges found using a tracking file. |
| 52 |
> > Subsequent runs of the module will re-load that info for re-display, |
| 53 |
> > re-emerge of those packages. |
| 54 |
> > |
| 55 |
> > |
| 56 |
> |
| 57 |
> Both suggestions look good to me. Should I update the commit messages, |
| 58 |
> merge to master, and push? |
| 59 |
> |
| 60 |
> Regards, |
| 61 |
> Pavel |
| 62 |
> |
| 63 |
|
| 64 |
update the messages, but hold off pushing them to master until I get |
| 65 |
2.2.11 released. I had intended ot have done that already, but Zac saw |
| 66 |
a problem in one bugfix I committed, so will wait for that so I don't |
| 67 |
introduce another bug. |
| 68 |
|
| 69 |
-- |
| 70 |
Brian Dolbec <dolsen> |
Archives