Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 331688 - RFC: Remove empty lines (containing only whitespace) when merging entries for a change in the same file, but different function.
Summary: RFC: Remove empty lines (containing only whitespace) when merging entries for...
Status: CLOSED FIXED
Alias: None
Product: Linux Tools
Classification: Tools
Component: ChangeLog (show other bugs)
Version: 0.7.0   Edit
Hardware: PC Linux
: P3 enhancement (vote)
Target Milestone: ---   Edit
Assignee: Phil Muldoon CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-12-02 11:08 EST by Severin Gehwolf CLA
Modified: 2010-12-10 18:06 EST (History)
2 users (show)

See Also:


Attachments
Patch implementing the proposed functionality (including a test for it). (6.54 KB, patch)
2010-12-02 11:08 EST, Severin Gehwolf CLA
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Severin Gehwolf CLA 2010-12-02 11:08:25 EST
Created attachment 184363 [details]
Patch implementing the proposed functionality (including a test for it).

Imagine the following existing ChangeLog:

2010-12-02  Some Author  <will@example.com>

    * path/to/fileA.c (main): Some change.
    <= here is a tab
    * path/to/fileB.c: New file.

2010-10-08  Author B  <b@bull.com>

   ....

When merging a new change in function "myfunction" on the same day in fileA.c current code would produce:

2010-12-02  Some Author  <will@example.com>

    * path/to/fileA.c (main): Some change.
    
    (myfunction): 
    * path/to/fileB.c: New file.

2010-10-08  Author B  <b@bull.com>

   ....

The with the proposed patch applied the code produces (note the removed "empty" line):

2010-12-02  Some Author  <will@example.com>

    * path/to/fileA.c (main): Some change.
    (myfunction): 
    * path/to/fileB.c: New file.

2010-10-08  Author B  <b@bull.com>

   ....

Patch including a test for this is attached. Let me know what you think. Thanks!
Comment 1 Jeff Johnston CLA 2010-12-10 15:28:23 EST
(In reply to comment #0)
> Created an attachment (id=184363) [details]
> Patch implementing the proposed functionality (including a test for it).
> 
> Imagine the following existing ChangeLog:
> 
> 2010-12-02  Some Author  <will@example.com>
> 
>     * path/to/fileA.c (main): Some change.
>     <= here is a tab
>     * path/to/fileB.c: New file.
> 
> 2010-10-08  Author B  <b@bull.com>
> 
>    ....
> 
> When merging a new change in function "myfunction" on the same day in fileA.c
> current code would produce:
> 
> 2010-12-02  Some Author  <will@example.com>
> 
>     * path/to/fileA.c (main): Some change.
> 
>     (myfunction): 
>     * path/to/fileB.c: New file.
> 
> 2010-10-08  Author B  <b@bull.com>
> 
>    ....
> 
> The with the proposed patch applied the code produces (note the removed "empty"
> line):
> 
> 2010-12-02  Some Author  <will@example.com>
> 
>     * path/to/fileA.c (main): Some change.
>     (myfunction): 
>     * path/to/fileB.c: New file.
> 
> 2010-10-08  Author B  <b@bull.com>
> 
>    ....
> 
> Patch including a test for this is attached. Let me know what you think.
> Thanks!

Sure, it obviously doesn't regress your other tests, so go ahead.
Comment 2 Severin Gehwolf CLA 2010-12-10 18:06:33 EST
Committed (Revision 27091). Closing this bug.