[Emacs-diffs] /srv/bzr/emacs/trunk r102942: * admin/notes/bzrmerge: Comment on skipped revisions.

[Glenn Morris]

------------------------------------------------------------
revno: 102942
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2011-01-22 11:44:38 -0800
message:
  * admin/notes/bzrmerge: Comment on skipped revisions.
modified:
  admin/notes/bzr

=== modified file 'admin/notes/bzr'
--- a/admin/notes/bzr   2011-01-18 02:57:04 +0000
+++ b/admin/notes/bzr   2011-01-22 19:44:38 +0000
@@ -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.