procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* admin/notes/bzr: Add some more bzrmerge details.

Browse source
This commit is contained in:
Glenn Morris 2011-01-17 18:22:36 -08:00
parent 74a10be5d3
commit b91f171d26
1 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
admin/notes/bzr
View file

@ -84,12 +84,23 @@ and to take either the trunk, branch, or both copies.
6) After resolving all conflicts, you might need to run the command
again if there are more revisions still to merge.
You can commit either before you do this (eg if you had a lot of
conflicts to resolve and don't want to get confused), or refrain from
committing until bzrmerge has merged all revisions.
Do not commit (or exit Emacs) until bzrmerge has merged all revisions!
Before committing, check bzr status and bzr diff output.
Note that ChangeLog entries are automatically merged to the top with
today's date, but you still might want to check them to see that too
much is not being included.
Notes:
1) A lot that was in tramp.el in emacs-23 has moved to tramp-sh.el in
the trunk. If you end up with a conflict in tramp.el, the changes may
need to go to tramp-sh.el instead. Remember to update the file name in
the ChangeLog.
2) If a file is modified in emacs-23, and deleted in the trunk, you
get a "contents conflict". Assuming the changes don't need to be in
the trunk at all, use `bzr resolve path/to/file --take-this' to keep the
trunk version. Prior to bzr 2.2.3, this may fail. You can just
delete the .OTHER etc files by hand and use bzr resolve path/to/file.