At http://people.canonical.com/~robertc/baz2.0/plugins/commitfromnews/trunk
------------------------------------------------------------ revno: 2 revision-id: [email protected] parent: [email protected] committer: Robert Collins <[email protected]> branch nick: trunk timestamp: Sat 2010-02-27 23:38:57 +1100 message: * Merge messages in the changed-NEWS file case. === modified file 'NEWS' --- a/NEWS 2010-02-27 12:17:25 +0000 +++ b/NEWS 2010-02-27 12:38:57 +0000 @@ -11,3 +11,4 @@ * Created plugin, basic functionality of looking for NEWS and including the NEWS diff. +* Merge messages in the changed-NEWS file case. === modified file 'committemplate.py' --- a/committemplate.py 2010-02-27 12:17:25 +0000 +++ b/committemplate.py 2010-02-27 12:38:57 +0000 @@ -85,7 +85,7 @@ if tag == 'delete': continue new_lines.extend(new[j1:j2]) - return ''.join(new_lines) + return self.merge_message(''.join(new_lines)) def merge_message(self, new_message): """Merge new_message with self.message. -- bazaar-commits mailing list [email protected] https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
