Debian Bug report logs - #268154
[DPKG] should offer configurable diff/merge program

Reply or subscribe to this bug.

Display info messages

Message #5 received at submit@bugs.debian.org (full text, mbox, reply):

From: Jari Aalto <jari.aalto@poboxes.com>

To: Debian Bug Tracking System <submit@bugs.debian.org>

Subject: apt-get: Upgrading should offer runninf a diff program, not just (D)

Date: Thu, 26 Aug 2004 12:47:56 +0300

Package: apt
Version: 0.5.27
Severity: normal

The upgrade asks many times questions like these:

    Configuration file `/etc/squirrelmail/apache.conf'
     ==> Modified (by you or by a script) since installation.
     ==> Package distributor has shipped an updated version.
       What would you like to do about it ?  Your options are:
	Y or I  : install the package maintainer's version
	N or O  : keep your currently-installed version
	  D     : show the differences between the versions
	  Z     : background this process to examine the situation

It makes upgrade process to require quite a much work, because of
the manual method the conflicts are resolved:

	Type D to see what's changed
	Type Z to shell out and manually do all the work, launch
	the editor, load the files, compare, diff, merge, reject
	 
The situation could be helped if APT offered a new selection:

	M   : run Merge program

Where the program and it's arguments could be defined in /etc/apt.conf.
There could be comment in  /etc/apt.conf how to launch emacs to handle
changes with ediff.el etc.  

	emacs --no-windows --no-init-file --no-site-file \
        --load ediff \
	--execute "(ediff \"%FILE%\" \"%FILE%.dpkg-dist")"

Where %FILE% were the name of the configuration file which APT would
substitute when using the defined call program. 

Jari

-- Package-specific info:

-- System Information:
Debian Release: 3.1
Architecture: i386 (i686)
Kernel: Linux 2.4.26.20040601
Locale: LANG=C, LC_CTYPE=C (ignored: LC_ALL set to en_US)

Versions of packages apt depends on:
ii  libc6                       2.3.2.ds1-16 GNU C Library: Shared libraries an
ii  libgcc1                     1:3.4.1-7    GCC support library
ii  libstdc++5                  1:3.3.4-9    The GNU Standard C++ Library v3

-- no debconf information

Message #46 received at 268154@bugs.debian.org (full text, mbox, reply):

From: PT FINDORA INTERNUSA <sankhokaihatsuco.ltd@outlook.com>

To: me <marketing01@findora.com>

Subject: P.O 22/09/2021

Date: Tue, 21 Sep 2021 21:26:56 -0700

[Message part 1 (text/plain, inline)]

Hello,

Good morning,

We have gone through your samples from a partner and Here is our  Order 
List. Please do bear in mind that we are very much in  need of this 
order, quote your competitive prices.

Kindly send the Order confirmation.

Your early reply will be much appreciated.

Best Regards,

Maryanah Erwin.

PT FINDORA INTERNUSA

Jln Pahlawan 66 Kec. Arjawinangun

45162 CIREBON West-Java INDONESIA

tel : +62 231 357334

fax: +62 231 357260

email: marketing@findora.com

[P.O22.09.2021.cab (application/zip, attachment)]

Send a report that this bug log contains spam.