Mercurial > emacs
comparison admin/notes/bzr @ 112341:1bdb2b6bdebb
* admin/notes/bzr: Add some more bzrmerge details.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Mon, 17 Jan 2011 18:22:36 -0800 |
parents | aee2f052ef17 |
children | 49c0a3b6d624 |
comparison
equal
deleted
inserted
replaced
112340:c904f3196c20 | 112341:1bdb2b6bdebb |
---|---|
76 | 76 |
77 It will prompt about revisions that should be skipped, based on the | 77 It will prompt about revisions that should be skipped, based on the |
78 regexp in bzrmerge-missing. If there are more revisions that you know | 78 regexp in bzrmerge-missing. If there are more revisions that you know |
79 need skipping, you'll have to do that by hand. | 79 need skipping, you'll have to do that by hand. |
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 command |
86 again if there are more revisions still to merge. | 86 again if there are more revisions still to merge. |
87 You can commit either before you do this (eg if you had a lot of | 87 Do not commit (or exit Emacs) until bzrmerge has merged all revisions! |
88 conflicts to resolve and don't want to get confused), or refrain from | |
89 committing until bzrmerge has merged all revisions. | |
90 | 88 |
91 Before committing, check bzr status and bzr diff output. | 89 Before committing, check bzr status and bzr diff output. |
92 | 90 |
93 Note that ChangeLog entries are automatically merged to the top with | 91 Note that ChangeLog entries are automatically merged to the top with |
94 today's date, but you still might want to check them to see that too | 92 today's date, but you still might want to check them to see that too |
95 much is not being included. | 93 much is not being included. |
94 | |
95 Notes: | |
96 | |
97 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 | |
99 need to go to tramp-sh.el instead. Remember to update the file name in | |
100 the ChangeLog. | |
101 | |
102 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 | |
104 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 | |
106 delete the .OTHER etc files by hand and use bzr resolve path/to/file. |