Author Topic: BerliOS Patch Tracker: Allow ZIP files?  (Read 5637 times)

Offline MortenMacFly

  • Administrator
  • Lives here!
  • *****
  • Posts: 9496
BerliOS Patch Tracker: Allow ZIP files?
« on: March 02, 2006, 01:34:23 pm »
Dear all,
I tried to upload a ZIP file to the Patch Tracker at BerliOS recently (a new template). This failed because it seems the Patch tracker really allows text (ascii) files only. Is it possible to post patches as a ZIP (binary) file anyway? ...or did I miss something?
Compiler logging: Settings->Compiler & Debugger->tab "Other"->Compiler logging="Full command line"
C::B Manual: http://www.codeblocks.org/docs/main_codeblocks_en.html
C::B FAQ: http://wiki.codeblocks.org/index.php?title=FAQ

Offline thomas

  • Administrator
  • Lives here!
  • *****
  • Posts: 3979
Re: BerliOS Patch Tracker: Allow ZIP files?
« Reply #1 on: March 02, 2006, 02:05:45 pm »
I noticed that too, but did not find where you can configure allowed extensions, sorry.
"We should forget about small efficiencies, say about 97% of the time: Premature quotation is the root of public humiliation."

Offline MortenMacFly

  • Administrator
  • Lives here!
  • *****
  • Posts: 9496
Re: BerliOS Patch Tracker: Allow ZIP files?
« Reply #2 on: March 02, 2006, 02:25:01 pm »
I noticed that too, but did not find where you can configure allowed extensions, sorry.
Mmmh... ok. Well, I can live with it if you tell me (us) a way how to post new files then -> so not a patch (modified files) but a set of new files. Something like "just plain" in the text box with a seperator line beween the different files?
With regards, Morten.
Compiler logging: Settings->Compiler & Debugger->tab "Other"->Compiler logging="Full command line"
C::B Manual: http://www.codeblocks.org/docs/main_codeblocks_en.html
C::B FAQ: http://wiki.codeblocks.org/index.php?title=FAQ

Offline killerbot

  • Administrator
  • Lives here!
  • *****
  • Posts: 5177
Re: BerliOS Patch Tracker: Allow ZIP files?
« Reply #3 on: March 02, 2006, 03:06:33 pm »
I have seen someone including new files in a patch, I think the person who provided the GnuArmPatch did it like that. So for those files hardly any "-" lines, and all "+" lines.

Offline MortenMacFly

  • Administrator
  • Lives here!
  • *****
  • Posts: 9496
Re: BerliOS Patch Tracker: Allow ZIP files?
« Reply #4 on: March 02, 2006, 03:36:39 pm »
I have seen someone including new files in a patch, I think the person who provided the GnuArmPatch did it like that. So for those files hardly any "-" lines, and all "+" lines.
I tried to copy the files to the svn folder and made a svn diff - no success. The ouput of svn diff is empty. I read the help of svn diff to find a parameter to include files not existing in the repository but I couldn't find one. But I agree - this should be possible though. Unfortunately I don't know how... :-(
Morten.
Compiler logging: Settings->Compiler & Debugger->tab "Other"->Compiler logging="Full command line"
C::B Manual: http://www.codeblocks.org/docs/main_codeblocks_en.html
C::B FAQ: http://wiki.codeblocks.org/index.php?title=FAQ

Offline thomas

  • Administrator
  • Lives here!
  • *****
  • Posts: 3979
Re: BerliOS Patch Tracker: Allow ZIP files?
« Reply #5 on: March 02, 2006, 03:38:28 pm »
I have seen someone including new files in a patch, I think the person who provided the GnuArmPatch did it like that. So for those files hardly any "-" lines, and all "+" lines.
Oh please don't use third-party tools for making patches when you don't need to (and you do not need to).
I don't know about GnuArmPatch, but we had people make patches with a diversity of Windows tools in the past. If you send in a patch that is not 100% conforming to what Subversion expects, it is a real pain. The developer reviewing/applying the patch has to gather all patched files manually and has to copy and paste every single line and remove the line header by hand.
I did that for a while, but I won't any longer. Applying an "average size" patch takes 10-15 minutes that way, and a larger patch is entirely unfeasonable. Occasionally, you use a wrong revision or confuse + and - lines, too...

Reviewing and applying a conforming patch using TortoiseMerge is a matter of a few seconds (unless you changed the whole file, for example by using the source formatter). It is very straightforward to watch the changes, it works seamlessly over different releases with merges and conflicts, and you can save and apply the changes directly from the merge tool without ever having to worry about a single detail.

If you send in a patch then please use either "Create Patch..." in TortoiseSVN or a similar tool, or use the svn commandline client: svn diff > nameofpatch.patch

Regarding the question of how to make a patch for new files, this is easy. Simply add the files to the working copy before creating the patch ("Add..." using TortoiseSVN or svn add filename(s) using the commandline tool).
This will create one patch file that contains all necessary data, including correct revision information.
« Last Edit: March 02, 2006, 03:40:30 pm by thomas »
"We should forget about small efficiencies, say about 97% of the time: Premature quotation is the root of public humiliation."

Offline killerbot

  • Administrator
  • Lives here!
  • *****
  • Posts: 5177
Re: BerliOS Patch Tracker: Allow ZIP files?
« Reply #6 on: March 02, 2006, 03:56:49 pm »
 :P :P :P GnuArmPatch is no 3rd party tool, it was the (svn) patch for the Gnu arm Support for CB ;-) ;-)
And that patch contained new files ...

Offline MortenMacFly

  • Administrator
  • Lives here!
  • *****
  • Posts: 9496
Re: BerliOS Patch Tracker: Allow ZIP files?
« Reply #7 on: March 02, 2006, 04:16:08 pm »
Simply add the files to the working copy before creating the patch [...]
Right - confirmed, this works. Sometimes things are easy in life. ;-)
To killerbot: I guess Thomas meant my attempt recently to provide a patch using a third party tool. I've learned my lesson that time.
To all: I guess this info would fit very well into a WiKi section. If there are no objections I would volunteer to write an article... in the evening or tomorrow.

With regards, Morten.

Ps.: Stay tuned for my "matlab_lexer" patch arriving soon to a SVN repository near you... 8)
Compiler logging: Settings->Compiler & Debugger->tab "Other"->Compiler logging="Full command line"
C::B Manual: http://www.codeblocks.org/docs/main_codeblocks_en.html
C::B FAQ: http://wiki.codeblocks.org/index.php?title=FAQ

Offline killerbot

  • Administrator
  • Lives here!
  • *****
  • Posts: 5177
Re: BerliOS Patch Tracker: Allow ZIP files?
« Reply #8 on: March 02, 2006, 04:19:25 pm »
wiki wiki : please document, very valuable !!!

Offline MortenMacFly

  • Administrator
  • Lives here!
  • *****
  • Posts: 9496
Re: BerliOS Patch Tracker: Allow ZIP files?
« Reply #9 on: March 02, 2006, 07:16:22 pm »
wiki wiki : please document, very valuable !!!
Done by now. See in the WiKi:
Section " Table of contents": Developing for Code::Blocks -> section: " General development" -> Creating a patch to submit to BerliOS (Patch Tracker).
I hope you'll agree.
With regards, Morten.
Compiler logging: Settings->Compiler & Debugger->tab "Other"->Compiler logging="Full command line"
C::B Manual: http://www.codeblocks.org/docs/main_codeblocks_en.html
C::B FAQ: http://wiki.codeblocks.org/index.php?title=FAQ

Offline Michael

  • Lives here!
  • ****
  • Posts: 1608
Re: BerliOS Patch Tracker: Allow ZIP files?
« Reply #10 on: March 02, 2006, 07:23:12 pm »
Done by now. See in the WiKi:
Section " Table of contents": Developing for Code::Blocks -> section: " General development" -> Creating a patch to submit to BerliOS (Patch Tracker).

Thank you very much :D.

Best wishes,
Michael