Recent

Author Topic: [UPDATED] Patch wrangler: deal with FPC's patch.exe on Windows  (Read 9558 times)

BigChimp

  • Hero Member
  • *****
  • Posts: 5740
  • Add to the wiki - it's free ;)
    • FPCUp, PaperTiger scanning and other open source projects
Re: [UPDATED] Patch wrangler: deal with FPC's patch.exe on Windows
« Reply #15 on: July 04, 2013, 12:18:12 pm »
Accepted the new request. Nothing happened. Clicked merge, then it merged ;)

As for development: up to now I've developed in the same repo (fpcup; no fork) with 2 persons. Hardly any merge conflicts... if you don't muck around at the same time of course.

BTW: does the program work for you on Linux now?
Want quicker answers to your questions? Read http://wiki.lazarus.freepascal.org/Lazarus_Faq#What_is_the_correct_way_to_ask_questions_in_the_forum.3F

Open source including papertiger OCR/PDF scanning:
https://bitbucket.org/reiniero

Lazarus trunk+FPC trunk x86, Windows x64 unless otherwise specified

JuhaManninen

  • Global Moderator
  • Hero Member
  • *****
  • Posts: 3807
  • I like bugs.
Re: [UPDATED] Patch wrangler: deal with FPC's patch.exe on Windows
« Reply #16 on: July 04, 2013, 12:53:28 pm »
Accepted the new request. Nothing happened. Clicked merge, then it merged ;)

Perfect. Thanks. :)

Quote
As for development: up to now I've developed in the same repo (fpcup; no fork) with 2 persons. Hardly any merge conflicts... if you don't muck around at the same time of course.

The people have commit access to your repo? Ok, then is works smoothly as well.
However the pull request system appears to be very handy, too, and does not require tweaking with commit rights.

Quote
BTW: does the program work for you on Linux now?

Unfortunately not. I try to apply patch from here:
  http://bugs.freepascal.org/view.php?id=24630

Apparently -p0 param is missing.

Code: [Select]
Original file ending is: Unix (LF).

Original file ending is: Unix (LF).

User switched root directory to /home/juha/SW/lazarus_gitsvn

User initiated dry run
Going to run: sh "-c" "/usr/bin/patch -b -d /home/juha/SW/lazarus_gitsvn --remove-empty-files --verbose --dry-run < /tmp/TMP00003.tmp"
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: heaptrc_settings.inc
|===================================================================
|--- heaptrc_settings.inc (revision 0)
|+++ heaptrc_settings.inc (working copy)
--------------------------
Patching file heaptrc_settings.inc using Plan A...
Hunk #1 succeeded at 1.
Hmm...  The next patch looks like a unified diff to me...
can't find file to patch at input line 13
Perhaps you should have used the -p or --strip option?
The text leading up to this was:
--------------------------
|Index: raw_window.pas
|===================================================================
|--- raw_window.pas (revision 41761)
|+++ raw_window.pas (working copy)
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
Hunk #1 ignored at 27.
Hunk #2 ignored at 42.
2 out of 2 hunks ignored
Hmm...  The next patch looks like a unified diff to me...
can't find file to patch at input line 39
Perhaps you should have used the -p or --strip option?
The text leading up to this was:
--------------------------
|Index: redirect_stderr.pas
|===================================================================
|--- redirect_stderr.pas (revision 41761)
|+++ redirect_stderr.pas (working copy)
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
Hunk #1 ignored at 27.
Hunk #2 ignored at 43.
2 out of 2 hunks ignored
done
Patch run gave result code 1
« Last Edit: July 05, 2013, 09:16:47 am by JuhaManninen »
Mostly Lazarus trunk on Manjaro Linux.

BigChimp

  • Hero Member
  • *****
  • Posts: 5740
  • Add to the wiki - it's free ;)
    • FPCUp, PaperTiger scanning and other open source projects
Re: [UPDATED] Patch wrangler: deal with FPC's patch.exe on Windows
« Reply #17 on: July 04, 2013, 01:00:18 pm »
Unfortunately not. I try to apply patch from here:
  http://bugs.freepascal.org/view.php?id=24630

Apparently -p0 param is missing.
Thanks; I'll have a look... might take a while though.
Want quicker answers to your questions? Read http://wiki.lazarus.freepascal.org/Lazarus_Faq#What_is_the_correct_way_to_ask_questions_in_the_forum.3F

Open source including papertiger OCR/PDF scanning:
https://bitbucket.org/reiniero

Lazarus trunk+FPC trunk x86, Windows x64 unless otherwise specified

 

TinyPortal © 2005-2018