Mercurial > emacs
comparison admin/notes/bzr @ 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 | e4640e51ea08 |
| children |
comparison
equal
deleted
inserted
replaced
| 112425:9f7614f1a892 | 112426:59f7ce1a78c6 |
|---|---|
| 90 Before committing, check bzr status and bzr diff output. | 90 Before committing, check bzr status and bzr diff output. |
| 91 If you have run bzrmerge enough times, the "pending merge tip" in bzr | 91 If you have run bzrmerge enough times, the "pending merge tip" in bzr |
| 92 status should be the last revision from the emacs-23 branch, and | 92 status should be the last revision from the emacs-23 branch, and |
| 93 bzr status -v should show all the revisions you expect to merge. | 93 bzr status -v should show all the revisions you expect to merge. |
| 94 | 94 |
| 95 (Note that it will also show "skipped" revisions. This is expected, | |
| 96 and is due to a technical limitation of bzr. The log data for those | |
| 97 revisions gets merged, the actual changes themselves do not. | |
| 98 http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00609.html ) | |
| 99 | |
| 95 Note that ChangeLog entries are automatically merged to the top with | 100 Note that ChangeLog entries are automatically merged to the top with |
| 96 today's date, but you still might want to check them to see that too | 101 today's date, but you still might want to check them to see that too |
| 97 much is not being included, or whitespace between entries is not missing. | 102 much is not being included, or whitespace between entries is not missing. |
| 98 | 103 |
| 99 Notes: | 104 Notes: |