Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 95682 - kompare 3.3 does not apply diff's when dealing with whole subdirs
Summary: kompare 3.3 does not apply diff's when dealing with whole subdirs
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: [OLD] KDE (show other bugs)
Hardware: AMD64 Linux
: High normal
Assignee: Gentoo KDE team
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2005-06-10 06:34 UTC by Francesco Lamonica
Modified: 2005-07-02 11:03 UTC (History)
0 users

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Francesco Lamonica 2005-06-10 06:34:28 UTC
When comparing the files existing in two directories and applying diffs the
destination files are transformed into directories. This does not happen with
kompare 3.4.0 and 3.3.2 compiled from sources in a slackware distro so should
not be an upstream bug.

Reproducible: Always
Steps to Reproduce:
1.open Kompare (3.3 from kde 3.3.2)
2.select "compare files.." from file menu
3.select two subdirs with just one slightly different file in them (for semplicity)
4.kompare will show you the diff between them
5. click on one of the arrows to apply/unapply diffs
6. try to save it

Actual Results:  
the modified file is transformed in a directory!!!!

Expected Results:  
patch should have been applied

Portage 2.0.51.19 (default-linux/amd64/2005.0, gcc-3.4.3,
glibc-2.3.4.20041102-r1, 2.6.11-gentoo-r7 x86_64)
=================================================================
System uname: 2.6.11-gentoo-r7 x86_64 AMD Athlon(tm) 64 Processor 3000+
Gentoo Base System version 1.6.12
Python:              dev-lang/python-2.3.5 [2.3.5 (#1, May 12 2005, 12:34:35)]
distcc 2.18.3 x86_64-pc-linux-gnu (protocols 1 and 2) (default port 3632) [disabled]
ccache version 2.3 [enabled]
dev-lang/python:     2.3.5
sys-apps/sandbox:    [Not Present]
sys-devel/autoconf:  2.59-r6, 2.13
sys-devel/automake:  1.9.5, 1.5, 1.8.5-r3, 1.6.3, 1.7.9-r1, 1.4_p6
sys-devel/binutils:  2.15.92.0.2-r10
sys-devel/libtool:   1.5.16
virtual/os-headers:  2.6.8.1-r4
ACCEPT_KEYWORDS="amd64"
AUTOCLEAN="yes"
CFLAGS="-march=k8 -O2 -pipe -fweb -ftracers"
CHOST="x86_64-pc-linux-gnu"
CONFIG_PROTECT="/etc /usr/kde/2/share/config /usr/kde/3.3/env
/usr/kde/3.3/share/config /usr/kde/3.3/shutdown /usr/kde/3/share/config
/usr/lib/X11/xkb /usr/share/config /usr/share/texmf/dvipdfm/config/
/usr/share/texmf/dvips/config/ /usr/share/texmf/tex/generic/config/
/usr/share/texmf/tex/platex/config/ /usr/share/texmf/xdvi/ /var/qmail/control"
CONFIG_PROTECT_MASK="/etc/gconf /etc/terminfo /etc/env.d"
CXXFLAGS="-march=k8 -O2 -pipe -fweb -ftracers"
DISTDIR="/usr/portage/distfiles"
FEATURES="autoaddcvs autoconfig candy ccache distlocks sandbox sfperms strict"
GENTOO_MIRRORS="http://distfiles.gentoo.org
http://distro.ibiblio.org/pub/Linux/distributions/gentoo"
LINGUAS="en it"
MAKEOPTS="-j2"
PKGDIR="/usr/portage/packages"
PORTAGE_TMPDIR="/var/tmp"
PORTDIR="/usr/portage"
SYNC="rsync://rsync.gentoo.org/gentoo-portage"
USE="amd64 X a52 aac acpi alsa arts avi berkdb bitmap-fonts bluetooth cdr crypt
cscope cups curl dvd dvdr encode esd fam flac font-server foomaticdb fortran
gdbm gif gpm gtk gtk2 imagemagick imlib jp2 jpeg kde libwww lzw lzw-tiff mad
matroska mbox mikmod motif mp3 mpeg ncurses nls ogg oggvorbis opengl oss pam
pcre perl png python qt readline samba sdl spell sqlite ssl tcpd tetex theora
tiff truetype truetype-fonts type1-fonts usb userlocales vorbis xine xml2 xmms
xpm xprint xrandr xv xvid zlib linguas_en linguas_it userland_GNU kernel_linux
elibc_glibc"
Unset:  ASFLAGS, CBUILD, CTARGET, LANG, LC_ALL, LDFLAGS, PORTDIR_OVERLAY
Comment 1 Gregorio Guidi (RETIRED) gentoo-dev 2005-06-10 08:41:26 UTC
Cannot reproduce, it works fine here. 
Comment 2 Dan Armak (RETIRED) gentoo-dev 2005-06-30 07:40:04 UTC
Please try kompare from kde 3.4.1. 
Comment 3 Francesco Lamonica 2005-07-02 11:03:55 UTC
Closing it, it works fine as for version 3.4.1