[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: a review of the merge (Re: Emacs.app merged)

From: Adrian Robert
Subject: Re: a review of the merge (Re: Emacs.app merged)
Date: Wed, 16 Jul 2008 08:17:49 -0400

On Jul 16, 2008, at 6:00 AM, Jason Rumney wrote:

Index: src/w32gui.h
+#include "w32bdf.h"

-/* Emulate widget_value from ../lwlib/lwlib.h, modified for Windows. */

This looks very suspicious, why touch the Windows code?

It looks like the merge encountered conflicts here, with the code that
was moved to keyboard.h (above) being in the vicinity of some code that
was removed on 26 June when I tidied up the font backend code. The
conflict was resolved in the wrong way, reintroducing the old code.
As long as that only happened here (and you seem to be checking the
patch thoroughly, so hopefully any further occurences will be caught),
it should be simple to fix this.

Sorry about this.  The way I did the merge was:

1) Merge from trunk in bzr on 7/14
2) Do a CVS checkout around the same time
3) Copy needed files from bzr tree to CVS tree on 7/15
4) Do a CVS update
5) Tag, and do a commit

I resolved all the conflicts reported to me in steps 1,4 (not many) -- though I don't remember one in w32gui.

The diff I posted and/or the CVS tag "before-merge-emacs-app-to-trunk" can hopefully help confirm / deny existence of additional spurious changes, if any.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]