diff options
Diffstat (limited to 'admin/notes')
| -rw-r--r-- | admin/notes/bzr | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/admin/notes/bzr b/admin/notes/bzr index 11472e83fc3..a6fbcf22bb2 100644 --- a/admin/notes/bzr +++ b/admin/notes/bzr | |||
| @@ -117,7 +117,10 @@ entries have been included or whitespace between entries needs fixing). | |||
| 117 | bzrmerge tries to fix up the dates to today's date, but it only does | 117 | bzrmerge tries to fix up the dates to today's date, but it only does |
| 118 | this where there are conflicts. If you used the changelog_merge plugin, | 118 | this where there are conflicts. If you used the changelog_merge plugin, |
| 119 | there won't be any conflicts, and (at time of writing) you will need | 119 | there won't be any conflicts, and (at time of writing) you will need |
| 120 | to adjust dates by hand. | 120 | to adjust dates by hand. In any case, if someone made multiple |
| 121 | ChangeLog entries on different days in the branch, you may wish to | ||
| 122 | collapse them all to a single entry for that author in the trunk | ||
| 123 | (because in the trunk they all appear under the same date). | ||
| 121 | 124 | ||
| 122 | Notes: | 125 | Notes: |
| 123 | 126 | ||