# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1295725478 28800
# Node ID 59f7ce1a78c6fe773ddd6f36da5032afe2aa18e8
# Parent  9f7614f1a8922083cccb1b38d081d20fe03ab7da
* admin/notes/bzrmerge: Comment on skipped revisions.

diff -r 9f7614f1a892 -r 59f7ce1a78c6 admin/notes/bzr
--- 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.