diff options
| author | Glenn Morris <[email protected]> | 2011-02-22 20:24:13 -0800 |
|---|---|---|
| committer | Glenn Morris <[email protected]> | 2011-02-22 20:24:13 -0800 |
| commit | ed3d1631555ed03d1c5b1b7738e16e59ffa7a48e (patch) | |
| tree | c3bf227b4b5167785afd1ff6100cb151644c4d36 /admin/notes | |
| parent | cce7d53002e8abc346b67ea4100507b0e7c4d68e (diff) | |
* admin/notes/bzr: More details about merging ChangeLogs.
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 11472e83fc..a6fbcf22bb 100644 --- a/admin/notes/bzr +++ b/admin/notes/bzr @@ -117,7 +117,10 @@ entries have been included or whitespace between entries needs fixing). bzrmerge tries to fix up the dates to today's date, but it only does this where there are conflicts. If you used the changelog_merge plugin, there won't be any conflicts, and (at time of writing) you will need -to adjust dates by hand. +to adjust dates by hand. In any case, if someone made multiple +ChangeLog entries on different days in the branch, you may wish to +collapse them all to a single entry for that author in the trunk +(because in the trunk they all appear under the same date). Notes: |