diff options
Diffstat (limited to 'admin/notes')
| -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. | |||
| 85 | 6) After resolving all conflicts, you might need to run the bzmerge | 85 | 6) After resolving all conflicts, you might need to run the bzmerge |
| 86 | command again if there are more revisions still to merge. | 86 | command again if there are more revisions still to merge. |
| 87 | 87 | ||
| 88 | Do not commit (or exit Emacs) until you have run bzrmerge to compeltion. | 88 | Do not commit (or exit Emacs) until you have run bzrmerge to completion. |
| 89 | 89 | ||
| 90 | 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 | 91 | 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. | |||
| 111 | 111 | ||
| 112 | 3) Conflicts in autoload md5sums in comments. Strictly speaking, the | 112 | 3) Conflicts in autoload md5sums in comments. Strictly speaking, the |
| 113 | right thing to do is merge everything else, resolve the conflict by | 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 | 114 | choosing either the trunk or branch version, then run `make -C lisp |
| 115 | autoloads' to update the md5sums to the correct trunk value before | 115 | autoloads' to update the md5sums to the correct trunk value before |
| 116 | committing. | 116 | committing. |