Mercurial > emacs

comparison admin/notes/bzr @ 112348:49c0a3b6d624

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* admin/notes/bzr: More bzrmerge notes.
author Glenn Morris <rgm@gnu.org>
date Mon, 17 Jan 2011 18:55:26 -0800
parents 1bdb2b6bdebb
children e4640e51ea08
comparison
equal deleted inserted replaced
112347:67bea318ed68 112348:49c0a3b6d624
80 80
81 5) It will stop if there are any conflicts. Resolve them. 81 5) It will stop if there are any conflicts. Resolve them.
82 Using smerge-mode, there are menu items to skip to the next conflict, 82 Using smerge-mode, there are menu items to skip to the next conflict,
83 and to take either the trunk, branch, or both copies. 83 and to take either the trunk, branch, or both copies.
84 84
85 6) After resolving all conflicts, you might need to run the command 85 6) After resolving all conflicts, you might need to run the bzmerge
86 again if there are more revisions still to merge. 86 command again if there are more revisions still to merge.
87 Do not commit (or exit Emacs) until bzrmerge has merged all revisions! 87
88 Do not commit (or exit Emacs) until you have run bzrmerge to compeltion.
88 89
89 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
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.
90 94
91 Note that ChangeLog entries are automatically merged to the top with 95 Note that ChangeLog entries are automatically merged to the top with
92 today's date, but you still might want to check them to see that too 96 today's date, but you still might want to check them to see that too
93 much is not being included. 97 much is not being included, or whitespace between entries is not missing.
94 98
95 Notes: 99 Notes:
96 100
97 1) A lot that was in tramp.el in emacs-23 has moved to tramp-sh.el in 101 1) A lot that was in tramp.el in emacs-23 has moved to tramp-sh.el in
98 the trunk. If you end up with a conflict in tramp.el, the changes may 102 the trunk. If you end up with a conflict in tramp.el, the changes may
102 2) If a file is modified in emacs-23, and deleted in the trunk, you 106 2) If a file is modified in emacs-23, and deleted in the trunk, you
103 get a "contents conflict". Assuming the changes don't need to be in 107 get a "contents conflict". Assuming the changes don't need to be in
104 the trunk at all, use `bzr resolve path/to/file --take-this' to keep the 108 the trunk at all, use `bzr resolve path/to/file --take-this' to keep the
105 trunk version. Prior to bzr 2.2.3, this may fail. You can just 109 trunk version. Prior to bzr 2.2.3, this may fail. You can just
106 delete the .OTHER etc files by hand and use bzr resolve path/to/file. 110 delete the .OTHER etc files by hand and use bzr resolve path/to/file.
111
112 3) Conflicts in autoload md5sums in comments. Strictly speaking, the
113 right thing to do is merge everything else, resolve the conflict by
114 choosig either the trunk or branch version, then run `make -C lisp
115 autoloads' to update the md5sums to the correct trunk value before
116 committing.