Mercurial > emacs
changeset 112426:59f7ce1a78c6
* admin/notes/bzrmerge: Comment on skipped revisions.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Sat, 22 Jan 2011 11:44:38 -0800 |
| parents | 9f7614f1a892 |
| children | bc872de587fa |
| files | admin/notes/bzr |
| diffstat | 1 files changed, 5 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/admin/notes/bzr Sat Jan 22 11:36:45 2011 -0800 +++ b/admin/notes/bzr Sat Jan 22 11:44:38 2011 -0800 @@ -92,6 +92,11 @@ status should be the last revision from the emacs-23 branch, and bzr status -v should show all the revisions you expect to merge. +(Note that it will also show "skipped" revisions. This is expected, +and is due to a technical limitation of bzr. The log data for those +revisions gets merged, the actual changes themselves do not. +http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00609.html ) + Note that ChangeLog entries are automatically merged to the top with today's date, but you still might want to check them to see that too much is not being included, or whitespace between entries is not missing.