diff options
| author | Glenn Morris <rgm@gnu.org> | 2011-01-22 11:44:38 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2011-01-22 11:44:38 -0800 |
| commit | 4474c927a7f8c8c53b2027d17357adf5613ae1bf (patch) | |
| tree | 1aebdc630c5ba9eef6da97902824b0ded4998acf /admin | |
| parent | 7c82f3e23e37cc848a38b1f8be7149fd672a6393 (diff) | |
| download | emacs-4474c927a7f8c8c53b2027d17357adf5613ae1bf.tar.gz | |
* admin/notes/bzrmerge: Comment on skipped revisions.
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/notes/bzr | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/admin/notes/bzr b/admin/notes/bzr index e3875af2976..cb2a1bd4e4f 100644 --- a/admin/notes/bzr +++ b/admin/notes/bzr @@ -92,6 +92,11 @@ If you have run bzrmerge enough times, the "pending merge tip" in bzr 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. |