From: Glenn Morris Date: Sat, 14 May 2011 19:09:37 +0000 (-0700) Subject: * admin/notes/bzr: Update changelog_merge branch details. X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~272 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dc5e0b5aace520e202bbbcdf0e728a4bdc72e043;p=emacs.git * admin/notes/bzr: Update changelog_merge branch details. --- diff --git a/admin/notes/bzr b/admin/notes/bzr index f4907063d0b..8720982e0aa 100644 --- a/admin/notes/bzr +++ b/admin/notes/bzr @@ -76,9 +76,8 @@ a similar way with unbound ones. (this will be included by default in bzr 2.4 onwards): cd ~/.bazaar/plugins -# The following is an improved version of: lp:bzr-changelog-merge -bzr branch lp:~spiv/bzr-changelog-merge/non-head-edits-723968 -mv bzr-changelog-merge changelog_merge +bzr branch http://bazaar.launchpad.net/~spiv/bzr-changelog-merge/trunk +mv trunk changelog_merge This should make merging ChangeLogs smoother. It merges new entries to the top of the file, rather than trying to fit them in mid-way