Quantcast

[ jEdit-devel ] jEdit CHANGELOG entries and making things easier for merging

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

[ jEdit-devel ] jEdit CHANGELOG entries and making things easier for merging

Alan Ezust-3
Administrator
If you put new changelog entries immediately after the line with the
explicit fold:

{{{ Bug Fixes

or the

{{{ API Changes

When you commit it to trunk, it merges into the 4.5.x branch much more
easily - since the merge puts it in the right place.
I still often have to hand-edit the CHANGES but at least it ends up in
the right place so I don't have to move things around - I just might
have to remove the <<<< ==== >>>>> lines.

------------------------------------------------------------------------------
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
--
-----------------------------------------------
jEdit Developers' List
[hidden email]
https://lists.sourceforge.net/lists/listinfo/jedit-devel
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: [ jEdit-devel ] jEdit CHANGELOG entries and making things easier for merging

Dale Anson
Administrator
So you're saying you'd prefer new change log entries at the top of the section rather than the bottom?


On Mon, Mar 12, 2012 at 10:39 AM, Alan Ezust <[hidden email]> wrote:
If you put new changelog entries immediately after the line with the
explicit fold:

{{{ Bug Fixes

or the

{{{ API Changes

When you commit it to trunk, it merges into the 4.5.x branch much more
easily - since the merge puts it in the right place.
I still often have to hand-edit the CHANGES but at least it ends up in
the right place so I don't have to move things around - I just might
have to remove the <<<< ==== >>>>> lines.

------------------------------------------------------------------------------
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
--
-----------------------------------------------
jEdit Developers' List
[hidden email]
https://lists.sourceforge.net/lists/listinfo/jedit-devel


------------------------------------------------------------------------------
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
--
-----------------------------------------------
jEdit Developers' List
[hidden email]
https://lists.sourceforge.net/lists/listinfo/jedit-devel
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: [ jEdit-devel ] jEdit CHANGELOG entries and making things easier for merging

Alan Ezust-3
Administrator
Exactly!

On Mon, Mar 12, 2012 at 9:54 AM, Dale Anson <[hidden email]> wrote:

> So you're saying you'd prefer new change log entries at the top of the
> section rather than the bottom?
>
>
> On Mon, Mar 12, 2012 at 10:39 AM, Alan Ezust <[hidden email]> wrote:
>>
>> If you put new changelog entries immediately after the line with the
>> explicit fold:
>>
>> {{{ Bug Fixes
>>
>> or the
>>
>> {{{ API Changes
>>
>> When you commit it to trunk, it merges into the 4.5.x branch much more
>> easily - since the merge puts it in the right place.
>> I still often have to hand-edit the CHANGES but at least it ends up in
>> the right place so I don't have to move things around - I just might
>> have to remove the <<<< ==== >>>>> lines.
>>
>>
>> ------------------------------------------------------------------------------
>> Try before you buy = See our experts in action!
>> The most comprehensive online learning library for Microsoft developers
>> is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
>> Metro Style Apps, more. Free future releases when you subscribe now!
>> http://p.sf.net/sfu/learndevnow-dev2
>> --
>> -----------------------------------------------
>> jEdit Developers' List
>> [hidden email]
>> https://lists.sourceforge.net/lists/listinfo/jedit-devel
>
>

------------------------------------------------------------------------------
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
--
-----------------------------------------------
jEdit Developers' List
[hidden email]
https://lists.sourceforge.net/lists/listinfo/jedit-devel
Loading...