[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [lmi] [PATCH 2/5] Split lmi_wx_shared into a DLL and small executabl
From: |
Greg Chicares |
Subject: |
Re: [lmi] [PATCH 2/5] Split lmi_wx_shared into a DLL and small executable. |
Date: |
Wed, 26 Feb 2014 15:40:45 +0000 |
User-agent: |
Mozilla/5.0 (Windows NT 5.1; rv:24.0) Gecko/20100101 Thunderbird/24.3.0 |
On 2014-02-18 17:14Z, Václav Slavík wrote:
>
> this series of patches introduces the GUI testing app.
Committed 20140226T1537Z, revision 5861.
Perhaps my (Cygwin) tools are faulty: they failed to apply two hunks
that seem perfectly legitimate. But it was easy enough to apply them
manually:
patching file main_wx.cpp
Hunk #2 FAILED at 100.
1 out of 2 hunks FAILED -- saving rejects to file main_wx.cpp.rej
This simply deletes everything from that line through the end of the
file. (The deleted lines obviously move into 'skeleton.cpp'.)
patching file main_wx.hpp
Reversed (or previously applied) patch detected! Assume -R? [n] n
Apply anyway? [n] y
Hunk #1 FAILED at 1.
File main_wx.hpp is not empty after patch, as expected
1 out of 1 hunk FAILED -- saving rejects to file main_wx.hpp.rej
And this one simply removes the entire file, as the patch header says:
delete mode 100644 main_wx.hpp
> This part
> splits the app into two pieces. Some file renaming is involved, so
> it would be nice to have patches 2/5 (this one) and 3/5 integrated
> in order to minimize the risk of conflicts between our changes.
I want to rename some things myself and make a few cosmetic changes,
but first I'm going to commit all five patches in this series.