Developer forums (C::B DEVELOPMENT STRICTLY!) > Development
(Another) enhancement for compiler interface GUI (+patch)
Michael:
--- Quote from: thomas on February 13, 2006, 02:31:37 pm ---
--- Quote from: Michael on February 13, 2006, 01:59:05 pm ---...and here too.
--- End quote ---
I don't know about Yiannis, but I stopped looking at that thread a while ago, since it contains so much outdated rubbish :lol:
The patch manager at BerliOS is a lot more manageable (the tracker is a lot better than the one at SF, too).
--- End quote ---
Yes, I was thinking about the outdate patches too :). May be when a patch is applied it could be removed from the topic. Anyway, I think that it is good to have patch posted there too so the users could know about them (at least for me is much easier to have a look at the topic instead of go to BerliOS). I am not sure if this is just a misunderstanding from me or not, but when a patch is submitted to BerliOS, would it possible to add a short description as in SF (not the summary)? If not, the topic could be used in that way.
Michael
MortenMacFly:
--- Quote from: thomas on February 13, 2006, 02:31:37 pm ---Just post it on here if you like, that'll be fine. Thanks :)
--- End quote ---
I am using Beyond Compare 2 (my #1 favorite tool for comparision and sync). There are 3 options how to create a diff file. I've attached you all 3 ("normal diff", "context based diff", "unified diff"). It would be really great if you could try which one works or has the format that is desired. The unified one (which is the one from my first post) obviously not. That would help me for the future. Cheers.
Morten.
[attachment deleted by admin]
MortenMacFly:
--- Quote from: Michael on February 13, 2006, 02:48:22 pm ---May be when a patch is applied it could be removed from the topic.
--- End quote ---
I think that's all what is required. A patch that is applied to the core is no longer of interest - for nobody. And if someone really needs a reference then there is SVN. So imho remove all where "Applied to core" equals "Yes" and Yiannis, Thomas and others may have a look again... ;-)
Morten.
mandrav:
--- Quote from: MortenMacFly on February 13, 2006, 02:48:33 pm ---
--- Quote from: thomas on February 13, 2006, 02:31:37 pm ---Just post it on here if you like, that'll be fine. Thanks :)
--- End quote ---
I am using Beyond Compare 2 (my #1 favorite tool for comparision and sync). There are 3 options how to create a diff file. I've attached you all 3 ("normal diff", "context based diff", "unified diff"). It would be really great if you could try which one works or has the format that is desired. The unified one (which is the one from my first post) obviously not. That would help me for the future. Cheers.
Morten.
--- End quote ---
I haven't looked at your patch but normally we want a unified diff (diff -u). But from what I read here this is probably not unified so I think we may have clashing terms...
EDIT: I looked at your zip and, yes, the unified is the correct one :), except for these "Left/right base" first lines...
thomas:
Hmm, neither of these works... :lol:
Actually, "unified" should work, but the one labelled as such is not "unified", at least not the header.
mind trying that please?
--- Code: ---cd D:\EigeneDateien\Code\codeblocks\svn\src
svn diff > correct.patch
--- End code ---
Subversion and Tortoise expect a diff file to look like this:
--- Code: ---Index: sdk/cbproject.h
===================================================================
--- sdk/cbproject.h (revision 1996)
+++ sdk/cbproject.h (working copy)
@@ -1,7 +1,7 @@
#ifndef CBPROJECT_H
#define CBPROJECT_H
-#include <wx/dynarray.h>
+#include <wx/dynarray.h> // modified line
#include <wx/hashmap.h>
#include <wx/treectrl.h>
--- End code ---
Navigation
[0] Message Index
[#] Next page
[*] Previous page
Go to full version