[Savannah-help-public] Re: unicode merge failures 2007-03-04

[Kenichi Handa]

In article <address@hidden>, Miles Bader <address@hidden> writes:

> Kenichi Handa <address@hidden> writes:
> > I've already reverted than change in emacs-unicode-2 branch.

> BTW, I looked at the CVS log to make sure I have your change, and the
> dates in the log seem pretty wrong.  Here's the relevant log entries
> (for src/process.c):

>    ----------------------------
>    revision 1.408.2.46
>    date: 2007-02-27 11:03:46 +0000;  author: handa;  state: Exp;  lines: +12 
> -79
>    Cancel the change done by sync with HEAD.
>    ----------------------------
>    revision 1.408.2.45
>    date: 2007-02-26 23:03:31 +0000;  author: miles;  state: Exp;  lines: +79 
> -12
>    Merge from emacs--devo--0

> I'm pretty sure I made my change yesterday, and that's 2007-03-04!!

I think nothting wrong.  Here's the timeline of changes of
process.c in HEAD and emacs-unicode-2:

        HEAD                    emacs-unicode-2
02-23   my change
02-27                           your merging
02-27                           my change (cancel the above change)
03-01   my change
03-04                           you tried merging and faced with conflict

---
Kenichi Handa
address@hidden