Bug 225486 - kompare doesn't apply a patch
Summary: kompare doesn't apply a patch
Status: RESOLVED FIXED
Alias: None
Product: kompare
Classification: Applications
Component: general (show other bugs)
Version: 4.0.0
Platform: unspecified Linux
: NOR normal
Target Milestone: ---
Assignee: Kompare developers
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-02-04 11:09 UTC by Toralf Förster
Modified: 2011-07-19 11:13 UTC (History)
3 users (show)

See Also:
Latest Commit:
Version Fixed In:
Sentry Crash Report:


Attachments
git diff (3.16 KB, text/plain)
2010-02-04 13:00 UTC, Toralf Förster
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Toralf Förster 2010-02-04 11:09:57 UTC
Version:           4.0.0 (using 4.3.5 (KDE 4.3.5), Gentoo)
Compiler:          i686-pc-linux-gnu-gcc
OS:                Linux (i686) release 2.6.31.12

I've made (as normal user) a patch of the linux kernel git sources with :
tfoerste@n22 ~ $ git diff 7e12715..c1c7af6 > ~/lid.patch

and tried (as root) to apply it to 2.6.32.7 sources:
n22 /usr/src/linux-2.6.32.7 # kompare /home/tfoerste/lid.patch

However I get :

Could not upload the temporary file to the destination location . The temporary file is still available under: /tmp/kde-root/kompareo14156.tmp. You can manually copy it to the right place.
Comment 1 Otto Bruggeman 2010-02-04 12:16:48 UTC
(In reply to comment #0)
> However I get :
> Could not upload the temporary file to the destination location . The temporary
> file is still available under: /tmp/kde-root/kompareo14156.tmp. You can
> manually copy it to the right place.

As you can see the destination location is empty, there is a space before the dot (there is a placeholder that should be expanded with the destination path) which means that parsing the git headers is probably not working properly. Can you paste the header of this particular file in the git diff?

Thanks a lot in advance.
Comment 2 Toralf Förster 2010-02-04 13:00:26 UTC
Created attachment 40528 [details]
git diff

Here it is.
BTW now I'm wondering if I can circumvent this issue by using a different diff format ?
Comment 3 Roland Schulz 2010-03-05 04:44:42 UTC
*** This bug has been confirmed by popular vote. ***
Comment 4 Toralf Förster 2011-03-09 10:45:52 UTC
fixed in 4.6.1
Comment 5 Konstantin Tokarev 2011-06-28 07:43:27 UTC
Is it really fixed? Applying patch using "kompare patchname" does not work in trunk.

Could you specify SVN revision of fix and/or how it's supposed to work?
Comment 6 Toralf Förster 2011-06-28 11:09:22 UTC
(In reply to comment #5)
> Could you specify SVN revision of fix and/or how it's supposed to work?
I tested it here under 4.6.4
Comment 7 Konstantin Tokarev 2011-07-19 10:23:10 UTC
Toralf: could you explain step by step how to apply patch file to directory with Kompare?

It seems like Kompare always edits patch file, and never touches files in target directory.
Comment 8 Toralf Förster 2011-07-19 11:13:29 UTC
(In reply to comment #7)
> Toralf: could you explain step by step how to apply patch file to directory
> with Kompare?
> 
> It seems like Kompare always edits patch file, and never touches files in
> target directory.

Seems, that it is no longer able to do that. But in the past it was IIRC, and this here stated this out too :
https://secure.wikimedia.org/wikipedia/en/wiki/Kompare#Creating_and_applying_patches