diff options
| author | Glenn Morris <rgm@gnu.org> | 2011-01-17 18:57:04 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2011-01-17 18:57:04 -0800 |
| commit | b69258a1a8ce556e7175fcac845443d7affc1f86 (patch) | |
| tree | a7a2436d5107745019f1018ad5bb5192b222788e /admin | |
| parent | 565cb73650f72bab9222d262fe991300738049fb (diff) | |
| download | emacs-b69258a1a8ce556e7175fcac845443d7affc1f86.tar.gz | |
* admin/notes/bzr: Fix typos in previous.
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/notes/bzr | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/admin/notes/bzr b/admin/notes/bzr index 69ad1a92b04..e3875af2976 100644 --- a/admin/notes/bzr +++ b/admin/notes/bzr @@ -85,7 +85,7 @@ and to take either the trunk, branch, or both copies. 6) After resolving all conflicts, you might need to run the bzmerge command again if there are more revisions still to merge. -Do not commit (or exit Emacs) until you have run bzrmerge to compeltion. +Do not commit (or exit Emacs) until you have run bzrmerge to completion. Before committing, check bzr status and bzr diff output. If you have run bzrmerge enough times, the "pending merge tip" in bzr @@ -111,6 +111,6 @@ delete the .OTHER etc files by hand and use bzr resolve path/to/file. 3) Conflicts in autoload md5sums in comments. Strictly speaking, the right thing to do is merge everything else, resolve the conflict by -choosig either the trunk or branch version, then run `make -C lisp +choosing either the trunk or branch version, then run `make -C lisp autoloads' to update the md5sums to the correct trunk value before committing. |