From 3cbbfdc34f9ef2c32f485b8d3ce444689115fa3c Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 23 Feb 2011 19:56:36 -0800 Subject: [PATCH] * admin/notes/bzr: Small updates. --- admin/notes/bzr | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/admin/notes/bzr b/admin/notes/bzr index a6fbcf22bb2..14a5c92a454 100644 --- a/admin/notes/bzr +++ b/admin/notes/bzr @@ -75,6 +75,12 @@ This will make merging ChangeLogs a lot smoother. It merges new entries to the top of the file, rather than trying to fit them in mid-way through. +Sigh. This plugin has a drawback. People often like to edit older +ChangeLog entries, not at the head of the file. Frequently they do +this in the same commit as making new entries. Using this plugin +will merge ALL changed entries (including older ones) to the top of +the destination file. + 1) Get clean, up-to-date copies of the emacs-23 and trunk branches. Check for any uncommitted changes with bzr status. @@ -121,6 +127,8 @@ to adjust dates by hand. In any case, if someone made multiple ChangeLog entries on different days in the branch, you may wish to collapse them all to a single entry for that author in the trunk (because in the trunk they all appear under the same date). +Obviously, if there are multiple changes to the same file by different +authors, don't break the logical ordering in doing this. Notes: -- 2.39.2