[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Changes to emacs-23 branch and the trunk
From: |
Kenichi Handa |
Subject: |
Re: Changes to emacs-23 branch and the trunk |
Date: |
Tue, 31 Aug 2010 20:44:20 +0900 |
In article <address@hidden>, Stefan Monnier <address@hidden> writes:
> > So to apply your procedure in the above model, what I should
> > do is this, right?
> > A % cd work-23
> > <make-change>
> > % bzr commit -m 'my change'
> > % cd ../emacs-23
> > B % bzr up
> > <assuming that there's no new change>
> > C % bzr merge ../work-23
> > % bzr commit -m 'my change'
> > % cd ../work
> > % bzr merge ../emacs-23
> > <fix conflicts>
> > % bzr commit -m "Merge by hand from emacs-23"
> > % cd ../trunk
> > % bzr up
> > <assuming that there's no new change>
> > % bzr commit -m "Merge by hand from emacs-23"
> That looks right, yes, except for a missing "bzr merge ../work" before
> the last commit.
Ah, sure, I forgot to write that step.
But, I've just proceeded to "% bzr merge ../emacs-23", and
this message was shown:
[work] bzr merge ../emacs-23
M doc/man/ChangeLog
M doc/man/emacs.1
M doc/misc/ChangeLog
M etc/ChangeLog
M etc/emacs3.py
M leim/ChangeLog
M leim/quail/japanese.el
M lisp/ChangeLog
M lisp/disp-table.el
M lisp/international/mule-cmds.el
M lisp/net/rcirc.el
M lisp/net/tramp-cmds.el
M lisp/net/tramp-compat.el
M lisp/net/tramp-fish.el
M lisp/net/tramp-ftp.el
M lisp/net/tramp-gvfs.el
M lisp/net/tramp-imap.el
M lisp/net/tramp-smb.el
M lisp/net/tramp-uu.el
M lisp/net/trampver.el
M lisp/play/cookie1.el
M lisp/progmodes/python.el
M lisp/simple.el
M src/ChangeLog
M src/dispextern.h
M src/term.c
M src/xdisp.c
Text conflict in doc/misc/ChangeLog
Text conflict in etc/ChangeLog
Text conflict in lisp/ChangeLog
Text conflict in lisp/net/rcirc.el
Text conflict in src/ChangeLog
Text conflict in src/xdisp.c
6 conflicts encountered.
This is strange. The above step apparently merged more than
what I committed in emacs-23 branch. That commit was done
as this just before the above merge:
[emacs-23] bzr commit -m 'Fix handling of 8-bit characters in a display table.'
Committing to: sftp://bzr.savannah.gnu.org/srv/bzr/emacs/emacs-23/
modified lisp/ChangeLog
modified lisp/disp-table.el
modified lisp/international/mule-cmds.el
modified src/ChangeLog
modified src/dispextern.h
modified src/term.c
modified src/xdisp.c
Committed revision 100011.
What was wrong?
---
Kenichi Handa
address@hidden