Developer forums (C::B DEVELOPMENT STRICTLY!) > Development
Some UI refactoring/tidy up
Jenna:
--- Quote from: dmoore on August 29, 2012, 06:26:00 am ---(The bigger problem may be because the patch was created on linux and you are trying to apply to windows)
--- End quote ---
If they are created with "svn diff", they normally work out of the box on windows.
MortenMacFly:
--- Quote from: jens on August 29, 2012, 06:32:00 am ---If they are created with "svn diff", they normally work out of the box on windows.
--- End quote ---
Yes, unless there are missing steps. Like here, patch assumes files to be present which are not. So it cannot work. Not even, if you do a svn cp, because they are assumed to be there, committed, in r8239 - that's not the case.
dmoore:
I guess you are using some "fancy" patch tool. good ole linux patch apparently ignores the stuff in parentheses, so it applies fine after creating the copies of the file. :-\
I've attached another one, hopefully this works. (It does say "revision 0" for the new files, hope that is what you are expecting)
@jens: yes, used svn diff.
I realize that I need to disable the option to convert line endings for multiline "find", because I don't think it makes sense. Maybe multiline search doesn't make sense at all for "find" (I figure that it will be occasionally useful so worth keeping).
MortenMacFly:
--- Quote from: dmoore on August 29, 2012, 06:44:56 am ---I've attached another one, hopefully this works. (It does say "revision 0" for the new files, hope that is what you are expecting)
--- End quote ---
Yes, this one worked out of the box (as expected).
--- Quote from: dmoore on August 29, 2012, 06:44:56 am ---I guess you are using some "fancy" patch tool. good ole linux patch apparently ignores the stuff in parentheses, so it applies fine after creating the copies of the file. :-\
--- End quote ---
Well I am on Windows - so thee is no "good ole linux patch". And still: A patch is correct only, if it doesn't require any pre-requisite. Everything else just may work but is not guaranteed.
dmoore:
--- Quote from: MortenMacFly on August 29, 2012, 06:30:47 am ---
--- Quote from: MortenMacFly on August 29, 2012, 06:27:40 am ---Yes, I did - but they were left un-modifed after applying the patch.
--- End quote ---
BTW, in the patch file you see this:
--- src/sdk/findreplacedlg.cpp (revision 8239)
+++ src/sdk/findreplacedlg.cpp (working copy)
...but this will fail, because in revision 8239 there is no such file. That's why I said you need to add them.
--- End quote ---
So OK I was wrong, but isn't that partly an issue with svn diff? Why does it treat the added file as if it was in revision 8239, when clearly it wasn't? I used svn cp, but I guess diff just treats the cp as having occurred and just reports the changes.
Navigation
[0] Message Index
[#] Next page
[*] Previous page
Go to full version