Phoenix - line ending/diff of code

wxPython Dev
1

Hi Robin,

I still see the issue that code shows a diff when it shouldn't.

I got r73930 and updated my svn checkout and then compared the folder wx.lib.floatcanvas using winmerge and they should as being different (i.e. all lines are different).

I see that you changed the SVN repo a few days ago, so deleted floatcanvas and did a new update to force SVN to get the whole file but still different.

So, I suspect that it is the snapshot which has the wrong ending.

Werner

2

Werner wrote:

Hi Robin,

I still see the issue that code shows a diff when it shouldn't.

I got r73930 and updated my svn checkout and then compared the folder
wx.lib.floatcanvas using winmerge and they should as being different
(i.e. all lines are different).

I see that you changed the SVN repo a few days ago, so deleted
floatcanvas and did a new update to force SVN to get the whole file but
still different.

So, I suspect that it is the snapshot which has the wrong ending.

Ah, so you're seeing the issue when comparing with the source in the snapshots? I thought you meant that you were seeing end-of-line issues just within your SVN workspace. Having different line endings in the snapshot tarballs is not too surprising.

One way to work around the issue would be to work only within the SVN workspace, making your changes there instead of in the snapshot. You can copy the binaries (the *.pyd files) plus the generated .py files in wx from the snapshot so you can run from the SVN workspace by setting PYTHONPATH. Then when you're ready you can simply run "svn diff wx/lib

···

whatever.patch" to make the patches.

--
Robin Dunn
Software Craftsman

3

Hi Robin,

···

On 07/05/2013 05:01, Robin Dunn wrote:

One way to work around the issue would be to work only within the SVN workspace, making your changes there instead of in the snapshot. You can copy the binaries (the *.pyd files) plus the generated .py files in wx from the snapshot so you can run from the SVN workspace by setting PYTHONPATH. Then when you're ready you can simply run "svn diff wx/lib > whatever.patch" to make the patches.

Thanks, will do that then.

Werner

P.S.
Could you recreate the wxWidgets debug issue with the script I sent the other day?

4

werner wrote:

Hi Robin,

One way to work around the issue would be to work only within the SVN
workspace, making your changes there instead of in the snapshot. You
can copy the binaries (the *.pyd files) plus the generated .py files
in wx from the snapshot so you can run from the SVN workspace by
setting PYTHONPATH. Then when you're ready you can simply run "svn
diff wx/lib > whatever.patch" to make the patches.

Thanks, will do that then.

Werner

P.S.
Could you recreate the wxWidgets debug issue with the script I sent the
other day?

I haven't opened that can of worms yet. :wink:

···

On 07/05/2013 05:01, Robin Dunn wrote:

--
Robin Dunn
Software Craftsman

5

Hi Robin,

...

I haven't opened that can of worms yet. :wink:

Just wanted to be sure that I could stop poking around the can ....:slight_smile: .

See you
Werner

···

On 07/05/2013 16:41, Robin Dunn wrote: